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/inventory.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/inventory.cpp')
| -rw-r--r-- | src/inventory.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/inventory.cpp b/src/inventory.cpp index 5030d67d1..c29bb9470 100644 --- a/src/inventory.cpp +++ b/src/inventory.cpp @@ -96,13 +96,17 @@ InventoryItem* InventoryItem::deSerialize(std::istream &is) #ifndef SERVER video::ITexture * MapBlockObjectItem::getImage() { + //TODO + if(m_inventorystring.substr(0,3) == "Rat") //return g_device->getVideoDriver()->getTexture(porting::getDataPath("rat.png").c_str()); - return g_irrlicht->getTexture("rat.png"); + //return g_irrlicht->getTexture("rat.png"); + return NULL; if(m_inventorystring.substr(0,4) == "Sign") //return g_device->getVideoDriver()->getTexture(porting::getDataPath("sign.png").c_str()); - return g_irrlicht->getTexture("sign.png"); + //return g_irrlicht->getTexture("sign.png"); + return NULL; return NULL; } |