oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

Clean InventoryItem interface a bit

Browse source
This commit is contained in:
Perttu Ahola 2011-11-16 14:44:01 +02:00
parent 7a29b14a20
commit f68fa667c8
5 changed files with 20 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/inventory.cpp
View file

@ -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