Merge pull request #34 from SpeedProg/master

[dragonfireclient.git] / src / mineral.cpp

diff --git a/src/mineral.cpp b/src/mineral.cpp
index c333ae6f5d988c93addc249d1d2019b5faa5b223..038251fa3a452f0936359cae5c78daadb89970ad 100644 (file)
--- a/src/mineral.cpp
+++ b/src/mineral.cpp
@@ -27,22 +27,22 @@ const char *mineral_filenames[MINERAL_COUNT] =
        "mineral_iron.png"
 };
 
-textureid_t mineral_textures[MINERAL_COUNT] = {0};
+std::string mineral_textures[MINERAL_COUNT];
 
-void init_mineral(IIrrlichtWrapper *irrlicht)
+void init_mineral()
 {
        for(u32 i=0; i<MINERAL_COUNT; i++)
        {
                if(mineral_filenames[i] == NULL)
                        continue;
-               mineral_textures[i] = irrlicht->getTextureId(mineral_filenames[i]);
+               mineral_textures[i] = mineral_filenames[i];
        }
 }
 
-textureid_t mineral_block_texture(u8 mineral)
+std::string mineral_block_texture(u8 mineral)
 {
        if(mineral >= MINERAL_COUNT)
-               return 0;
+               return "";
        
        return mineral_textures[mineral];
 }