summaryrefslogtreecommitdiff
path: root/src/inventory.h
diff options
context:
space:
mode:
authorPerttu Ahola <celeron55@gmail.com>2011-11-13 10:57:55 +0200
committerPerttu Ahola <celeron55@gmail.com>2011-11-29 19:13:40 +0200
commit64996422c00ddb70cfc8aee7da7b62485b8b0416 (patch)
treefdaa59ba3c52069f8935cf5d8d1cd63752edb149 /src/inventory.h
parentf8c9b703798873c6e958560341105069dca8f86c (diff)
downloadminetest-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.h')
-rw-r--r--src/inventory.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/inventory.h b/src/inventory.h
index dc5b04ff7..c202d5533 100644
--- a/src/inventory.h
+++ b/src/inventory.h
@@ -151,10 +151,7 @@ public:
return new MaterialItem(m_content, m_count);
}
#ifndef SERVER
- video::ITexture * getImage() const
- {
- return content_features(m_content).inventory_texture;
- }
+ video::ITexture * getImage() const;
#endif
std::string getText()
{