Irrlicht 1.9 support

[dragonfireclient.git] / src / client / tile.h

diff --git a/src/client/tile.h b/src/client/tile.h
index c08ffc8ad080d9649c0d881077ed9da37c4aff19..b759168413be36687a2432bb6b3d1b7fa3c91f4e 100644 (file)
--- a/src/client/tile.h
+++ b/src/client/tile.h
@@ -21,7 +21,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define TILE_HEADER
 
 #include "irrlichttypes.h"
-#include "irr_v2d.h"
 #include "irr_v3d.h"
 #include <ITexture.h>
 #include <IrrlichtDevice.h>
@@ -113,8 +112,7 @@ class ITextureSource : public ISimpleTextureSource
                        const TextureFromMeshParams &params)=0;
        virtual video::ITexture* getNormalTexture(const std::string &name)=0;
        virtual video::SColor getTextureAverageColor(const std::string &name)=0;
-       virtual video::ITexture *getShaderFlagsTexture(bool normamap_present,
-                       bool tileable_vertical, bool tileable_horizontal)=0;
+       virtual video::ITexture *getShaderFlagsTexture(bool normalmap_present)=0;
 };
 
 class IWritableTextureSource : public ITextureSource
@@ -137,8 +135,7 @@ class IWritableTextureSource : public ITextureSource
        virtual void rebuildImagesAndTextures()=0;
        virtual video::ITexture* getNormalTexture(const std::string &name)=0;
        virtual video::SColor getTextureAverageColor(const std::string &name)=0;
-       virtual video::ITexture *getShaderFlagsTexture(bool normamap_present,
-                       bool tileable_vertical, bool tileable_horizontal)=0;
+       virtual video::ITexture *getShaderFlagsTexture(bool normalmap_present)=0;
 };
 
 IWritableTextureSource* createTextureSource(IrrlichtDevice *device);
@@ -218,9 +215,7 @@ struct TileSpec
                        alpha == other.alpha &&
                        material_type == other.material_type &&
                        material_flags == other.material_flags &&
-                       rotation == other.rotation &&
-                       (material_flags & MATERIAL_FLAG_TILEABLE_HORIZONTAL) &&
-                       (material_flags & MATERIAL_FLAG_TILEABLE_VERTICAL)
+                       rotation == other.rotation
                );
        }