diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2011-08-22 12:53:18 +0300 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2011-08-22 12:53:18 +0300 |
| commit | f98eda4d52643ad88a0750133a6608b334d0487e (patch) | |
| tree | 735fc3c0ac556c281a38ade5b2a886f7ef574e8f /src/mapnode.h | |
| parent | 23717510c21c89f39760faf033844d531fc093b5 (diff) | |
| parent | c51564ab5b97e0b603de5413bd28aa1f729de5ba (diff) | |
| download | minetest-f98eda4d52643ad88a0750133a6608b334d0487e.tar.gz minetest-f98eda4d52643ad88a0750133a6608b334d0487e.tar.bz2 minetest-f98eda4d52643ad88a0750133a6608b334d0487e.zip | |
Merge remote-tracking branch 'oblomov/liquid_fixes'
Diffstat (limited to 'src/mapnode.h')
| -rw-r--r-- | src/mapnode.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/mapnode.h b/src/mapnode.h index 3101a9fc1..4c2b92853 100644 --- a/src/mapnode.h +++ b/src/mapnode.h @@ -153,6 +153,10 @@ struct ContentFeatures content_t liquid_alternative_flowing; // If the content is liquid, this is the source version of the liquid. content_t liquid_alternative_source; + // Viscosity for fluid flow, ranging from 1 to 7, with + // 1 giving almost instantaneous propagation and 7 being + // the slowest possible + u8 liquid_viscosity; // Used currently for flowing liquids u8 vertex_alpha; // Special irrlicht material, used sometimes @@ -189,6 +193,7 @@ struct ContentFeatures initial_metadata = NULL; liquid_alternative_flowing = CONTENT_IGNORE; liquid_alternative_source = CONTENT_IGNORE; + liquid_viscosity = 0; vertex_alpha = 255; special_material = NULL; special_atlas = NULL; @@ -424,6 +429,10 @@ enum LightBank #define LIQUID_LEVEL_MASK 0x07 #define LIQUID_FLOW_DOWN_MASK 0x08 +/* maximum amount of liquid in a block */ +#define LIQUID_LEVEL_MAX LIQUID_LEVEL_MASK +#define LIQUID_LEVEL_SOURCE (LIQUID_LEVEL_MAX+1) + /* This is the stuff what the whole world consists of. */ |