Fixed water mesh generation acting weird next to sand

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

diff --git a/src/mineral.h b/src/mineral.h
index 6c10c2256ef3160a52b51e0ca1f878befcf47c5a..61776e669c5d7711f4af23aec4c73a16ead74db6 100644 (file)
--- a/src/mineral.h
+++ b/src/mineral.h
@@ -21,8 +21,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define MINERAL_HEADER
 
 #include "inventory.h"
-#include "texture.h"
-#include "irrlichtwrapper.h"
 
 /*
        Minerals
@@ -31,10 +29,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
        type param.
 */
 
-#ifndef SERVER
 // Caches textures
-void init_mineral(IrrlichtWrapper *irrlicht);
-#endif
+void init_mineral();
 
 #define MINERAL_NONE 0
 #define MINERAL_COAL 1
@@ -42,7 +38,7 @@ void init_mineral(IrrlichtWrapper *irrlicht);
 
 #define MINERAL_COUNT 3
 
-textureid_t mineral_block_texture(u8 mineral);
+std::string mineral_block_texture(u8 mineral);
 
 inline CraftItem * getDiggedMineralItem(u8 mineral)
 {