Fix misc. style issues

diff --git a/src/nodedef.cpp b/src/nodedef.cpp
index 92e4b59b3322bc64457d917cd92a5bccc98693f5..ce1515fd2d9fcebd8245f6a2d9dad54605ae37af 100644 (file)
--- 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
index 78aaef00e2be36c0971f7efbbf0e7644080fbe6a..f4dc572e7cbbe668ed2165a4df2a15c2d9c0549b 100644 (file)
--- 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
index 92a4735c4a1f81ba681c19db1dc913cee1754c43..5ba97afd515ecb03656418f1cb651c6440766d2d 100644 (file)
--- 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)
 {