diff options
| author | kwolekr <kwolekr@minetest.net> | 2014-10-03 03:49:06 -0400 |
|---|---|---|
| committer | kwolekr <kwolekr@minetest.net> | 2014-10-03 03:49:06 -0400 |
| commit | 37d3c3d328a27346a2d9f5935aca127af0b7cf1a (patch) | |
| tree | 946066041fda0a7ff1a3e611a4beecaef2a43c04 | |
| parent | 01ce57ade534f83d80bbb1f0c48630891b338237 (diff) | |
| download | minetest-37d3c3d328a27346a2d9f5935aca127af0b7cf1a.tar.gz minetest-37d3c3d328a27346a2d9f5935aca127af0b7cf1a.tar.bz2 minetest-37d3c3d328a27346a2d9f5935aca127af0b7cf1a.zip | |
Fix misc. style issues
| -rw-r--r-- | src/nodedef.cpp | 6 | ||||
| -rw-r--r-- | src/tile.h | 10 | ||||
| -rw-r--r-- | src/util/string.cpp | 5 |
3 files changed, 14 insertions, 7 deletions
diff --git a/src/nodedef.cpp b/src/nodedef.cpp index 92e4b59b3..ce1515fd2 100644 --- 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 78aaef00e..f4dc572e7 100644 --- 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 92a4735c4..5ba97afd5 100644 --- 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) { |