ToolDefManager serialization

[oweals/minetest.git] / src / materials.cpp

diff --git a/src/materials.cpp b/src/materials.cpp
index d905ca2910a94699a7f2e52a6160a40b16de461d..d89b1e07950aced430c3cff2730f15dfdac422dc 100644 (file)
--- a/src/materials.cpp
+++ b/src/materials.cpp
@@ -1,31 +1,31 @@
 #include "materials.h"
 #include "mapnode.h"
-#include "mapnode_contentfeatures.h"
-#include "tool.h"
+#include "nodedef.h"
+#include "tooldef.h"
 
-DiggingProperties getDiggingProperties(u16 material, const std::string &tool)
+DiggingProperties getDiggingProperties(u16 content, ToolDiggingProperties *tp,
+               INodeDefManager *nodemgr)
 {
-       MaterialProperties &mp = content_features(material).material;
+       assert(tp);
+       const MaterialProperties &mp = nodemgr->get(content).material;
        if(mp.diggability == DIGGABLE_NOT)
                return DiggingProperties(false, 0, 0);
        if(mp.diggability == DIGGABLE_CONSTANT)
                return DiggingProperties(true, mp.constant_time, 0);
 
-       ToolDiggingProperties tp = tool_get_digging_properties(tool);
-       
-       float time = tp.basetime;
-       time += tp.dt_weight * mp.weight;
-       time += tp.dt_crackiness * mp.crackiness;
-       time += tp.dt_crumbliness * mp.crumbliness;
-       time += tp.dt_cuttability * mp.cuttability;
+       float time = tp->basetime;
+       time += tp->dt_weight * mp.weight;
+       time += tp->dt_crackiness * mp.crackiness;
+       time += tp->dt_crumbliness * mp.crumbliness;
+       time += tp->dt_cuttability * mp.cuttability;
        if(time < 0.2)
                time = 0.2;
 
-       float durability = tp.basedurability;
-       durability += tp.dd_weight * mp.weight;
-       durability += tp.dd_crackiness * mp.crackiness;
-       durability += tp.dd_crumbliness * mp.crumbliness;
-       durability += tp.dd_cuttability * mp.cuttability;
+       float durability = tp->basedurability;
+       durability += tp->dd_weight * mp.weight;
+       durability += tp->dd_crackiness * mp.crackiness;
+       durability += tp->dd_crumbliness * mp.crumbliness;
+       durability += tp->dd_cuttability * mp.cuttability;
        if(durability < 1)
                durability = 1;