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/materials.cpp | |
| parent | abceeee92f99b84ebb79968269835a4f509bfb90 (diff) | |
| download | minetest-c6fd2986d4261cf742d3bc21e8c12be59ab89f95.tar.gz minetest-c6fd2986d4261cf742d3bc21e8c12be59ab89f95.tar.bz2 minetest-c6fd2986d4261cf742d3bc21e8c12be59ab89f95.zip | |
GameDef compiles
Diffstat (limited to 'src/materials.cpp')
| -rw-r--r-- | src/materials.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
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) |