From c6fd2986d4261cf742d3bc21e8c12be59ab89f95 Mon Sep 17 00:00:00 2001 From: Perttu Ahola Date: Mon, 14 Nov 2011 21:41:30 +0200 Subject: GameDef compiles --- src/inventory.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/inventory.cpp') 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 -- cgit v1.2.3