diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2011-11-16 14:44:01 +0200 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2011-11-29 19:13:47 +0200 |
| commit | f68fa667c8723cc39f113502c53cc5c35eb32ab6 (patch) | |
| tree | d1c8a3dd207a45dc2c1ff0f8703a62687d9875aa /src/inventory.cpp | |
| parent | 7a29b14a20b16b97fd0d97d9f305fe0d53c160bf (diff) | |
| download | minetest-f68fa667c8723cc39f113502c53cc5c35eb32ab6.tar.gz minetest-f68fa667c8723cc39f113502c53cc5c35eb32ab6.tar.bz2 minetest-f68fa667c8723cc39f113502c53cc5c35eb32ab6.zip | |
Clean InventoryItem interface a bit
Diffstat (limited to 'src/inventory.cpp')
| -rw-r--r-- | src/inventory.cpp | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/src/inventory.cpp b/src/inventory.cpp index b0b128418..5b99617b3 100644 --- a/src/inventory.cpp +++ b/src/inventory.cpp @@ -179,7 +179,7 @@ MaterialItem::MaterialItem(IGameDef *gamedef, content_t content, u16 count): } #ifndef SERVER -video::ITexture * MaterialItem::getImage(ITextureSource *tsrc) const +video::ITexture * MaterialItem::getImage() const { return m_gamedef->getNodeDefManager()->get(m_nodename).inventory_texture; } @@ -232,11 +232,10 @@ std::string ToolItem::getImageBasename() const } #ifndef SERVER -video::ITexture * ToolItem::getImage(ITextureSource *tsrc) const +video::ITexture * ToolItem::getImage() const { - if(tsrc == NULL) - return NULL; - + ITextureSource *tsrc = m_gamedef->tsrc(); + std::string basename = getImageBasename(); /* @@ -253,10 +252,9 @@ video::ITexture * ToolItem::getImage(ITextureSource *tsrc) const return tsrc->getTextureRaw(os.str()); } -video::ITexture * ToolItem::getImageRaw(ITextureSource *tsrc) const +video::ITexture * ToolItem::getImageRaw() const { - if(tsrc == NULL) - return NULL; + ITextureSource *tsrc = m_gamedef->tsrc(); return tsrc->getTextureRaw(getImageBasename()); } @@ -267,11 +265,10 @@ video::ITexture * ToolItem::getImageRaw(ITextureSource *tsrc) const */ #ifndef SERVER -video::ITexture * CraftItem::getImage(ITextureSource *tsrc) const +video::ITexture * CraftItem::getImage() const { - if(tsrc == NULL) - return NULL; - + ITextureSource *tsrc = m_gamedef->tsrc(); + std::string name = item_craft_get_image_name(m_subname, m_gamedef); // Get such a texture |