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 c663d92757e63cd5f6114871eaa055feb47038e7..fcc1bd123d5ed0f427d2a8276b74bf186911f93a 100644 (file)
--- a/src/mineral.h
+++ b/src/mineral.h
@@ -22,7 +22,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "inventory.h"
 #include "texture.h"
-#include "iirrlichtwrapper.h"
 
 /*
        Minerals
@@ -32,7 +31,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 */
 
 // Caches textures
-void init_mineral(IIrrlichtWrapper *irrlicht);
+void init_mineral();
 
 #define MINERAL_NONE 0
 #define MINERAL_COAL 1
@@ -40,7 +39,8 @@ void init_mineral(IIrrlichtWrapper *irrlicht);
 
 #define MINERAL_COUNT 3
 
-textureid_t mineral_block_texture(u8 mineral);
+//textureid_t mineral_block_texture(u8 mineral);
+std::string mineral_block_texture(u8 mineral);
 
 inline CraftItem * getDiggedMineralItem(u8 mineral)
 {