Fix misc. style issues

minetest · Oct 3, 2014 · 37d3c3d · 37d3c3d
1 parent 01ce57a
commit 37d3c3d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/src/nodedef.cpp b/src/nodedef.cpp
@@ -536,8 +536,8 @@ content_t CNodeDefManager::getId(const std::string &name) const
 }
 
 
-void CNodeDefManager::getIds(const std::string &name, std::set<content_t> &result)
-		const
+void CNodeDefManager::getIds(const std::string &name,
+		std::set<content_t> &result) const
 {
 	//TimeTaker t("getIds", NULL, PRECISION_MICRO);
 	if (name.substr(0,6) != "group:") {
@@ -768,6 +768,8 @@ void CNodeDefManager::updateTextures(ITextureSource *tsrc, IShaderSource *shdsrc
 			break;
 		case NDT_FIRELIKE:
 			f->backface_culling = false;
+			f->solidness = 0;
+			break;
 		case NDT_TORCHLIKE:
 		case NDT_SIGNLIKE:
 		case NDT_FENCELIKE:

diff --git a/src/tile.h b/src/tile.h
@@ -229,7 +229,7 @@ struct TileSpec
 	// Sets everything else except the texture in the material
 	void applyMaterialOptions(video::SMaterial &material) const
 	{
-		switch(material_type){
+		switch (material_type) {
 		case TILE_MATERIAL_BASIC:
 			material.MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF;
 			break;
@@ -247,14 +247,16 @@ struct TileSpec
 			break;
 		case TILE_MATERIAL_WAVING_PLANTS:
 			material.MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF;
-		break;
+			break;
 		}
-		material.BackfaceCulling = (material_flags & MATERIAL_FLAG_BACKFACE_CULLING) ? true : false;
+		material.BackfaceCulling = (material_flags & MATERIAL_FLAG_BACKFACE_CULLING)
+			? true : false;
 	}
 
 	void applyMaterialOptionsWithShaders(video::SMaterial &material) const
 	{
-		material.BackfaceCulling = (material_flags & MATERIAL_FLAG_BACKFACE_CULLING) ? true : false;
+		material.BackfaceCulling = (material_flags & MATERIAL_FLAG_BACKFACE_CULLING)
+			? true : false;
 	}
 
 	u32 texture_id;

diff --git a/src/util/string.cpp b/src/util/string.cpp
@@ -30,7 +30,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "../porting.h"
 
 #ifdef __ANDROID__
-const wchar_t* wide_chars = L" !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~";
+const wchar_t* wide_chars =
+	L" !\"#$%&'()*+,-./0123456789:;<=>?@"
+	L"ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`"
+	L"abcdefghijklmnopqrstuvwxyz{|}~";
 
 int wctomb(char *s, wchar_t wc)
 {