Optimize headers

[oweals/minetest.git] / src / tile.h

diff --git a/src/tile.h b/src/tile.h
index 8b19b4c32e3ee55106ef0a8415732f6509d8a58b..8c1f42e075f4fe9405b4aad5552aa23ba11f2840 100644 (file)
--- a/src/tile.h
+++ b/src/tile.h
@@ -20,9 +20,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef TILE_HEADER
 #define TILE_HEADER
 
-#include "common_irrlicht.h"
+#include "irrlichttypes.h"
+#include "irr_v2d.h"
+#include "irr_v3d.h"
+#include <ITexture.h>
+#include <IrrlichtDevice.h>
 #include "threads.h"
-#include "utility.h"
 #include <string>
 
 class IGameDef;
@@ -205,11 +208,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 +228,7 @@ struct TileSpec
        }
        
        AtlasPointer texture;
-       // Vertex alpha
+       // Vertex alpha (when MATERIAL_ALPHA_VERTEX is used)
        u8 alpha;
        // Material parameters
        u8 material_type;