added -Wno-unused-but-set-variable, which hides a new warning in gcc 4.6 which only...

[minetest.git] / src / mineral.h

diff --git a/src/mineral.h b/src/mineral.h
index e43e48ab88076f66b655947235bd2da4edb2d038..fcc1bd123d5ed0f427d2a8276b74bf186911f93a 100644 (file)
--- a/src/mineral.h
+++ b/src/mineral.h
@@ -21,6 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define MINERAL_HEADER
 
 #include "inventory.h"
+#include "texture.h"
 
 /*
        Minerals
@@ -29,22 +30,17 @@ with this program; if not, write to the Free Software Foundation, Inc.,
        type param.
 */
 
+// Caches textures
+void init_mineral();
+
 #define MINERAL_NONE 0
 #define MINERAL_COAL 1
 #define MINERAL_IRON 2
 
-inline const char * mineral_block_texture(u8 mineral)
-{
-       switch(mineral)
-       {
-       case MINERAL_COAL:
-               return "mineral_coal.png";
-       case MINERAL_IRON:
-               return "mineral_iron.png";
-       default:
-               return "";
-       }
-}
+#define MINERAL_COUNT 3
+
+//textureid_t mineral_block_texture(u8 mineral);
+std::string mineral_block_texture(u8 mineral);
 
 inline CraftItem * getDiggedMineralItem(u8 mineral)
 {