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/materials.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/materials.cpp') diff --git a/src/materials.cpp b/src/materials.cpp index e990371ee..d89b1e079 100644 --- a/src/materials.cpp +++ b/src/materials.cpp @@ -1,12 +1,13 @@ #include "materials.h" #include "mapnode.h" -#include "mapnode_contentfeatures.h" -#include "tool.h" +#include "nodedef.h" +#include "tooldef.h" -DiggingProperties getDiggingProperties(u16 material, ToolDiggingProperties *tp) +DiggingProperties getDiggingProperties(u16 content, ToolDiggingProperties *tp, + INodeDefManager *nodemgr) { assert(tp); - MaterialProperties &mp = content_features(material).material; + const MaterialProperties &mp = nodemgr->get(content).material; if(mp.diggability == DIGGABLE_NOT) return DiggingProperties(false, 0, 0); if(mp.diggability == DIGGABLE_CONSTANT) -- cgit v1.2.3