Split settings into seperate source and header files

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

diff --git a/src/tile.h b/src/tile.h
index f3250669e2b45d751f52513858a49359ce05ddd1..78aaef00e2be36c0971f7efbbf0e7644080fbe6a 100644 (file)
--- a/src/tile.h
+++ b/src/tile.h
@@ -98,7 +98,6 @@ public:
        ITextureSource(){}
        virtual ~ITextureSource(){}
        virtual u32 getTextureId(const std::string &name)=0;
-       virtual u32 getTextureIdDirect(const std::string &name)=0;
        virtual std::string getTextureName(u32 id)=0;
        virtual video::ITexture* getTexture(u32 id)=0;
        virtual video::ITexture* getTexture(
@@ -116,7 +115,6 @@ public:
        IWritableTextureSource(){}
        virtual ~IWritableTextureSource(){}
        virtual u32 getTextureId(const std::string &name)=0;
-       virtual u32 getTextureIdDirect(const std::string &name)=0;
        virtual std::string getTextureName(u32 id)=0;
        virtual video::ITexture* getTexture(u32 id)=0;
        virtual video::ITexture* getTexture(
@@ -173,6 +171,7 @@ enum MaterialType{
 // Animation made up by splitting the texture to vertical frames, as
 // defined by extra parameters
 #define MATERIAL_FLAG_ANIMATION_VERTICAL_FRAMES 0x08
+#define MATERIAL_FLAG_HIGHLIGHTED 0x10
 
 /*
        This fully defines the looks of a tile.