diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2011-11-13 10:57:55 +0200 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2011-11-29 19:13:40 +0200 |
| commit | 64996422c00ddb70cfc8aee7da7b62485b8b0416 (patch) | |
| tree | fdaa59ba3c52069f8935cf5d8d1cd63752edb149 /src/inventory.cpp | |
| parent | f8c9b703798873c6e958560341105069dca8f86c (diff) | |
| download | minetest-64996422c00ddb70cfc8aee7da7b62485b8b0416.tar.gz minetest-64996422c00ddb70cfc8aee7da7b62485b8b0416.tar.bz2 minetest-64996422c00ddb70cfc8aee7da7b62485b8b0416.zip | |
Move ContentFeatures to mapnode_contentfeatures.{h,cpp} and clean stuff
Diffstat (limited to 'src/inventory.cpp')
| -rw-r--r-- | src/inventory.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
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); |