diff options
author | Perttu Ahola <celeron55@gmail.com> | 2012-06-17 02:40:36 +0300 |
---|---|---|
committer | Perttu Ahola <celeron55@gmail.com> | 2012-06-17 02:40:36 +0300 |
commit | d0ea6f9920d30f46d1f5d44e8823a8d932f9f29d (patch) | |
tree | 5b75f389b027a058e1f47fa3103a1cfb51f26b9b /src/tile.h | |
parent | 1bc37d576ce790c1169c5f9996be7bbc8026db2c (diff) | |
download | hax-minetest-server-d0ea6f9920d30f46d1f5d44e8823a8d932f9f29d.tar.gz hax-minetest-server-d0ea6f9920d30f46d1f5d44e8823a8d932f9f29d.zip |
Properly and efficiently use split utility headers
Diffstat (limited to 'src/tile.h')
-rw-r--r-- | src/tile.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/tile.h b/src/tile.h index 8b19b4c32..a6609a3a6 100644 --- a/src/tile.h +++ b/src/tile.h @@ -22,7 +22,6 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "common_irrlicht.h" #include "threads.h" -#include "utility.h" #include <string> class IGameDef; @@ -205,11 +204,6 @@ struct TileSpec // Sets everything else except the texture in the material void applyMaterialOptions(video::SMaterial &material) const { - if(alpha != 255 && material_type != MATERIAL_ALPHA_VERTEX) - dstream<<"WARNING: TileSpec: alpha != 255 " - "but not MATERIAL_ALPHA_VERTEX" - <<std::endl; - if(material_type == MATERIAL_ALPHA_NONE) material.MaterialType = video::EMT_SOLID; else if(material_type == MATERIAL_ALPHA_VERTEX) @@ -230,7 +224,7 @@ struct TileSpec } AtlasPointer texture; - // Vertex alpha + // Vertex alpha (when MATERIAL_ALPHA_VERTEX is used) u8 alpha; // Material parameters u8 material_type; |