aboutsummaryrefslogtreecommitdiff
path: root/src/mapnode.h
diff options
context:
space:
mode:
authorPerttu Ahola <celeron55@gmail.com>2011-01-24 01:58:15 +0200
committerPerttu Ahola <celeron55@gmail.com>2011-01-24 01:58:15 +0200
commit4a952f22d779cdce27dbfc68a23a7d13d3e62c0d (patch)
treee9951cd312a946a3b47bbbfa424041b452aa1093 /src/mapnode.h
parentf0819246702e3c25bc7bd354c0ed6f6520454b80 (diff)
downloadhax-minetest-server-4a952f22d779cdce27dbfc68a23a7d13d3e62c0d.tar.gz
hax-minetest-server-4a952f22d779cdce27dbfc68a23a7d13d3e62c0d.zip
small fixes here and there
Diffstat (limited to 'src/mapnode.h')
-rw-r--r--src/mapnode.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/mapnode.h b/src/mapnode.h
index e3b921a66..286edcc2b 100644
--- a/src/mapnode.h
+++ b/src/mapnode.h
@@ -211,6 +211,12 @@ inline u8 face_contents(u8 m1, u8 m2)
return 0;
bool contents_differ = (m1 != m2);
+
+ // Contents don't differ for different forms of same liquid
+ if(content_liquid(m1) && content_liquid(m2)
+ && make_liquid_flowing(m1) == make_liquid_flowing(m2))
+ contents_differ = false;
+
bool solidness_differs = (content_solidness(m1) != content_solidness(m2));
bool makes_face = contents_differ && solidness_differs;