aboutsummaryrefslogtreecommitdiff
path: root/src/inventory.cpp
diff options
context:
space:
mode:
authorKahrl <kahrl@gmx.net>2011-09-19 06:37:24 +0200
committerKahrl <kahrl@gmx.net>2011-09-19 06:37:24 +0200
commit02726f00031c8ffadf5298b037b595372be202ef (patch)
tree3a4feaac018b62fe33bdc338a8e1c2d38ddaa376 /src/inventory.cpp
parent36bcbca9acabbc47976d3d7625ffb1c9396b8fdc (diff)
downloadminetest-02726f00031c8ffadf5298b037b595372be202ef.tar.xz
Convert any inventory item into a mesh, bring back InventoryItem::getImageRay(), some const-correctness fixes
Diffstat (limited to 'src/inventory.cpp')
-rw-r--r--src/inventory.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/inventory.cpp b/src/inventory.cpp
index f31e19f77..a3e35c92c 100644
--- a/src/inventory.cpp
+++ b/src/inventory.cpp
@@ -158,7 +158,7 @@ InventoryItem *MaterialItem::createCookResult() const
*/
#ifndef SERVER
-video::ITexture * CraftItem::getImage()
+video::ITexture * CraftItem::getImage() const
{
if(g_texturesource == NULL)
return NULL;
@@ -224,7 +224,7 @@ bool CraftItem::use(ServerEnvironment *env, Player *player)
TODO: Remove
*/
#ifndef SERVER
-video::ITexture * MapBlockObjectItem::getImage()
+video::ITexture * MapBlockObjectItem::getImage() const
{
if(m_inventorystring.substr(0,3) == "Rat")
return g_texturesource->getTextureRaw("rat.png");