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/content_mapnode.cpp | |
| 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/content_mapnode.cpp')
| -rw-r--r-- | src/content_mapnode.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/content_mapnode.cpp b/src/content_mapnode.cpp index 7174a8a4b..f45853c4a 100644 --- a/src/content_mapnode.cpp +++ b/src/content_mapnode.cpp @@ -26,6 +26,9 @@ with this program; if not, write to the Free Software Foundation, Inc., #define WATER_ALPHA 160 +#define WATER_VISC 1 +#define LAVA_VISC 7 + // TODO: Get rid of these and set up some attributes like toughness, // fluffyness, and a funciton to calculate time and durability loss // (and sound? and whatever else) from them @@ -374,6 +377,7 @@ void content_mapnode_init() f->liquid_type = LIQUID_FLOWING; f->liquid_alternative_flowing = CONTENT_WATER; f->liquid_alternative_source = CONTENT_WATERSOURCE; + f->liquid_viscosity = WATER_VISC; f->vertex_alpha = WATER_ALPHA; if(f->special_material == NULL && g_texturesource) { @@ -421,6 +425,7 @@ void content_mapnode_init() f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->liquid_alternative_flowing = CONTENT_WATER; f->liquid_alternative_source = CONTENT_WATERSOURCE; + f->liquid_viscosity = WATER_VISC; f->vertex_alpha = WATER_ALPHA; if(f->special_material == NULL && g_texturesource) { @@ -451,6 +456,7 @@ void content_mapnode_init() f->liquid_type = LIQUID_FLOWING; f->liquid_alternative_flowing = CONTENT_LAVA; f->liquid_alternative_source = CONTENT_LAVASOURCE; + f->liquid_viscosity = LAVA_VISC; f->damage_per_second = 4*2; if(f->special_material == NULL && g_texturesource) { @@ -499,6 +505,7 @@ void content_mapnode_init() f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->liquid_alternative_flowing = CONTENT_LAVA; f->liquid_alternative_source = CONTENT_LAVASOURCE; + f->liquid_viscosity = LAVA_VISC; f->damage_per_second = 4*2; if(f->special_material == NULL && g_texturesource) { |