From: Perttu Ahola <celeron55@gmail.com>
Date: Tue, 15 Nov 2011 20:21:12 +0000 (+0200)
Subject: Fix flowing water being always opaque
X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=9fc78cbece4d26307dab814d8073fc0a1db90bf9;p=zefram%2Fminetest%2Fminetest_engine.git

Fix flowing water being always opaque
---

diff --git a/src/game.cpp b/src/game.cpp
index 7efce23a..bb199806 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -645,7 +645,7 @@ void the_game(
 	IWritableNodeDefManager *nodedef = createNodeDefManager();
 
 	// Fill node feature table with default definitions
-	content_mapnode_init(nodedef);
+	//content_mapnode_init(nodedef);
 
 	/*
 		Create server.
diff --git a/src/nodedef.cpp b/src/nodedef.cpp
index c86a3aef..c1aee5df 100644
--- a/src/nodedef.cpp
+++ b/src/nodedef.cpp
@@ -445,6 +445,9 @@ public:
 				f->special_materials[j]->setFlag(video::EMF_BILINEAR_FILTER, false);
 				f->special_materials[j]->setFlag(video::EMF_FOG_ENABLE, true);
 				f->special_materials[j]->setTexture(0, f->special_aps[j]->atlas);
+				if(f->alpha != 255)
+					f->special_materials[j]->MaterialType =
+							video::EMT_TRANSPARENT_VERTEX_ALPHA;
 			}
 		}
 #endif
diff --git a/src/nodedef.h b/src/nodedef.h
index b78b09d4..b7cca52d 100644
--- a/src/nodedef.h
+++ b/src/nodedef.h
@@ -245,11 +245,11 @@ struct ContentFeatures
 	
 	void setTexture(u16 i, std::string name);
 
-	void setAllTextures(std::string name, u8 alpha=255)
+	void setAllTextures(std::string name, u8 alpha_=255)
 	{
 		for(u16 i=0; i<6; i++)
 			setTexture(i, name);
-		alpha = alpha;
+		alpha = alpha_;
 		// Force inventory texture too
 		setInventoryTexture(name);
 	}