From: kwolekr <kwolekr@minetest.net>
Date: Fri, 3 Oct 2014 15:20:29 +0000 (-0400)
Subject: Fix special tile backspace culling
X-Git-Tag: 0.4.11~239
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=173beeee65289464d2541c44f753d21cd1fa3155;p=oweals%2Fminetest.git

Fix special tile backspace culling
---

diff --git a/src/nodedef.cpp b/src/nodedef.cpp
index 895761f59..f1a7ad694 100644
--- a/src/nodedef.cpp
+++ b/src/nodedef.cpp
@@ -394,8 +394,8 @@ private:
 	void addNameIdMapping(content_t i, std::string name);
 #ifndef SERVER
 	void fillTileAttribs(ITextureSource *tsrc, TileSpec *tile, TileDef *tiledef,
-		u32 shader_id, bool use_normal_texture, u8 alpha, u8 material_type, 
-		bool backface_culling);
+		u32 shader_id, bool use_normal_texture, bool backface_culling,
+		u8 alpha, u8 material_type);
 #endif
 
 	// Features indexed by id
@@ -801,13 +801,14 @@ void CNodeDefManager::updateTextures(ITextureSource *tsrc, IShaderSource *shdsrc
 		// Tiles (fill in f->tiles[])
 		for (u16 j = 0; j < 6; j++) {
 			fillTileAttribs(tsrc, &f->tiles[j], &tiledef[j], tile_shader[j],
-				use_normal_texture, f->alpha, material_type, f->backface_culling);
+				use_normal_texture, f->backface_culling, f->alpha, material_type);
 		}
 
 		// Special tiles (fill in f->special_tiles[])
 		for (u16 j = 0; j < CF_SPECIAL_COUNT; j++) {
 			fillTileAttribs(tsrc, &f->special_tiles[j], &f->tiledef_special[j],
-				tile_shader[j], use_normal_texture, f->alpha, material_type, f->backface_culling);
+				tile_shader[j], use_normal_texture,
+				f->tiledef_special[j].backface_culling, f->alpha, material_type);
 		}
 	}
 #endif
@@ -817,7 +818,7 @@ void CNodeDefManager::updateTextures(ITextureSource *tsrc, IShaderSource *shdsrc
 #ifndef SERVER
 void CNodeDefManager::fillTileAttribs(ITextureSource *tsrc, TileSpec *tile,
 		TileDef *tiledef, u32 shader_id, bool use_normal_texture,
-		u8 alpha, u8 material_type, bool backface_culling)
+		bool backface_culling, u8 alpha, u8 material_type)
 {
 	tile->shader_id     = shader_id;
 	tile->texture       = tsrc->getTexture(tiledef->name, &tile->texture_id);