diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2011-11-14 21:41:30 +0200 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2011-11-29 19:13:42 +0200 |
| commit | c6fd2986d4261cf742d3bc21e8c12be59ab89f95 (patch) | |
| tree | ef6ce8210f7f017bce42a024b75a44e73b5ab139 /src/inventory.cpp | |
| parent | abceeee92f99b84ebb79968269835a4f509bfb90 (diff) | |
| download | minetest-c6fd2986d4261cf742d3bc21e8c12be59ab89f95.tar.gz minetest-c6fd2986d4261cf742d3bc21e8c12be59ab89f95.tar.bz2 minetest-c6fd2986d4261cf742d3bc21e8c12be59ab89f95.zip | |
GameDef compiles
Diffstat (limited to 'src/inventory.cpp')
| -rw-r--r-- | src/inventory.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/inventory.cpp b/src/inventory.cpp index 4ac2453de..8ddbd3ac8 100644 --- a/src/inventory.cpp +++ b/src/inventory.cpp @@ -29,8 +29,8 @@ 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" -#include "tool.h" +#include "nodedef.h" +#include "tooldef.h" #include "gamedef.h" /* @@ -152,7 +152,7 @@ ServerActiveObject* InventoryItem::createSAO(ServerEnvironment *env, u16 id, v3f #ifndef SERVER video::ITexture * MaterialItem::getImage(ITextureSource *tsrc) const { - return content_features(m_content).inventory_texture; + return m_gamedef->getNodeDefManager()->get(m_content).inventory_texture; } #endif |