From: Perttu Ahola <celeron55@gmail.com>
Date: Mon, 22 Aug 2011 19:44:43 +0000 (+0300)
Subject: Fixed water mesh generation acting weird next to sand
X-Git-Tag: 0.2.20110922~33
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=db495668aeed333c881d8c2ef62b72b3cd1bf1ce;p=oweals%2Fminetest.git

Fixed water mesh generation acting weird next to sand
---

diff --git a/src/content_mapblock.cpp b/src/content_mapblock.cpp
index c0845ec57..b4006140d 100644
--- a/src/content_mapblock.cpp
+++ b/src/content_mapblock.cpp
@@ -373,7 +373,7 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
 			};
 			for(u32 i=0; i<9; i++)
 			{
-				u8 content = CONTENT_AIR;
+				content_t content = CONTENT_AIR;
 				float level = -0.5 * BS;
 				u8 flags = 0;
 				// Check neighbor
@@ -422,7 +422,7 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
 				for(u32 j=0; j<4; j++)
 				{
 					v3s16 neighbordir = cornerdir - halfdirs[j];
-					u8 content = neighbor_contents[neighbordir];
+					content_t content = neighbor_contents[neighbordir];
 					// If top is liquid, draw starting from top of node
 					if(neighbor_flags[neighbordir] &
 							neighborflag_top_is_same_liquid)