From 64996422c00ddb70cfc8aee7da7b62485b8b0416 Mon Sep 17 00:00:00 2001 From: Perttu Ahola Date: Sun, 13 Nov 2011 10:57:55 +0200 Subject: Move ContentFeatures to mapnode_contentfeatures.{h,cpp} and clean stuff --- src/inventory.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src/inventory.cpp') diff --git a/src/inventory.cpp b/src/inventory.cpp index c9ba9b4e5..ec1a81b18 100644 --- a/src/inventory.cpp +++ b/src/inventory.cpp @@ -33,6 +33,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "content_sao.h" #include "player.h" #include "log.h" +#include "mapnode_contentfeatures.h" /* InventoryItem @@ -148,6 +149,13 @@ ServerActiveObject* InventoryItem::createSAO(ServerEnvironment *env, u16 id, v3f MaterialItem */ +#ifndef SERVER +video::ITexture * MaterialItem::getImage() const +{ + return content_features(m_content).inventory_texture; +} +#endif + bool MaterialItem::isCookable() const { return item_material_is_cookable(m_content); -- cgit v1.2.3