diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2011-02-10 02:13:03 +0200 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2011-02-10 02:13:03 +0200 |
| commit | 1704badc306fc8c7c6609aff9f809aee3ac00d3a (patch) | |
| tree | 76e1ba37bb0ec12bb744a6015f56613ba088e148 /src/mineral.cpp | |
| parent | 949383a2f7c0707667f76615fc748ff4879e2cc1 (diff) | |
| download | minetest-1704badc306fc8c7c6609aff9f809aee3ac00d3a.tar.gz minetest-1704badc306fc8c7c6609aff9f809aee3ac00d3a.tar.bz2 minetest-1704badc306fc8c7c6609aff9f809aee3ac00d3a.zip | |
work-in-progress texture atlas optimization
Diffstat (limited to 'src/mineral.cpp')
| -rw-r--r-- | src/mineral.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/mineral.cpp b/src/mineral.cpp index c333ae6f5..905f6497c 100644 --- a/src/mineral.cpp +++ b/src/mineral.cpp @@ -27,7 +27,8 @@ const char *mineral_filenames[MINERAL_COUNT] = "mineral_iron.png" }; -textureid_t mineral_textures[MINERAL_COUNT] = {0}; +//textureid_t mineral_textures[MINERAL_COUNT] = {0}; +std::string mineral_textures[MINERAL_COUNT]; void init_mineral(IIrrlichtWrapper *irrlicht) { @@ -35,14 +36,17 @@ void init_mineral(IIrrlichtWrapper *irrlicht) { if(mineral_filenames[i] == NULL) continue; - mineral_textures[i] = irrlicht->getTextureId(mineral_filenames[i]); + //mineral_textures[i] = irrlicht->getTextureId(mineral_filenames[i]); + //mineral_textures[i] = 0; + mineral_textures[i] = mineral_filenames[i]; } } -textureid_t mineral_block_texture(u8 mineral) +//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]; } |