From 1704badc306fc8c7c6609aff9f809aee3ac00d3a Mon Sep 17 00:00:00 2001 From: Perttu Ahola Date: Thu, 10 Feb 2011 02:13:03 +0200 Subject: work-in-progress texture atlas optimization --- src/mineral.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'src/mineral.cpp') 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]; } -- cgit v1.2.3