diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2011-01-07 19:39:27 +0200 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2011-01-07 19:39:27 +0200 |
| commit | 6b6c2d37ea1f9075c4fbf0d7e2d52e527e1f86aa (patch) | |
| tree | 16ab23387dc95d0f42e6519e500d4024e2a2f826 /src/inventory.h | |
| parent | dc414091e736badc6fd2faa6a2583639a3458818 (diff) | |
| download | minetest-6b6c2d37ea1f9075c4fbf0d7e2d52e527e1f86aa.tar.gz minetest-6b6c2d37ea1f9075c4fbf0d7e2d52e527e1f86aa.tar.bz2 minetest-6b6c2d37ea1f9075c4fbf0d7e2d52e527e1f86aa.zip | |
Added a more flexible path system (and fixed some minor stuff)
Diffstat (limited to 'src/inventory.h')
| -rw-r--r-- | src/inventory.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/inventory.h b/src/inventory.h index 97eacef5b..84ccd5bd6 100644 --- a/src/inventory.h +++ b/src/inventory.h @@ -131,7 +131,7 @@ public: if(m_content >= USEFUL_CONTENT_COUNT) return NULL; - return g_irrlicht->getTexture(g_content_inventory_textures[m_content]); + return g_irrlicht->getTexture(g_content_inventory_texture_paths[m_content]); } #endif std::string getText() @@ -258,7 +258,7 @@ public: { std::string basename; if(m_subname == "Stick") - basename = "../data/stick.png"; + basename = porting::getDataPath("stick.png").c_str(); // Default to cloud texture else basename = tile_texture_path_get(TILE_CLOUD); @@ -333,11 +333,11 @@ public: { std::string basename; if(m_toolname == "WPick") - basename = "../data/tool_wpick.png"; + basename = porting::getDataPath("tool_wpick.png").c_str(); else if(m_toolname == "STPick") - basename = "../data/tool_stpick.png"; + basename = porting::getDataPath("tool_stpick.png").c_str(); else if(m_toolname == "MesePick") - basename = "../data/tool_mesepick.png"; + basename = porting::getDataPath("tool_mesepick.png").c_str(); // Default to cloud texture else basename = tile_texture_path_get(TILE_CLOUD); |