From: Perttu Ahola <celeron55@gmail.com>
Date: Fri, 2 Nov 2012 16:05:42 +0000 (+0200)
Subject: Fix flowing liquid animation direction calculation
X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=2863a3291a5cc9be8eeff063cd187a783e58c163;p=zefram%2Fminetest%2Fminetest_engine.git

Fix flowing liquid animation direction calculation
---

diff --git a/src/content_mapblock.cpp b/src/content_mapblock.cpp
index ad819e79..ff8ef527 100644
--- a/src/content_mapblock.cpp
+++ b/src/content_mapblock.cpp
@@ -492,15 +492,15 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
 				// -Z towards +Z, thus the direction is +Z.
 				// Rotate texture to make animation go in flow direction
 				// Positive if liquid moves towards +Z
-				int dz = (corner_levels[side_corners[2][0]] +
-						corner_levels[side_corners[2][1]] <
-						corner_levels[side_corners[3][0]] +
-						corner_levels[side_corners[3][1]]);
+				int dz = (corner_levels[side_corners[3][0]] +
+						corner_levels[side_corners[3][1]]) -
+						(corner_levels[side_corners[2][0]] +
+						corner_levels[side_corners[2][1]]);
 				// Positive if liquid moves towards +X
-				int dx = (corner_levels[side_corners[0][0]] +
-						corner_levels[side_corners[0][1]] <
-						corner_levels[side_corners[1][0]] +
-						corner_levels[side_corners[1][1]]);
+				int dx = (corner_levels[side_corners[1][0]] +
+						corner_levels[side_corners[1][1]]) -
+						(corner_levels[side_corners[0][0]] +
+						corner_levels[side_corners[0][1]]);
 				// -X
 				if(-dx >= abs(dz))
 				{