From abceeee92f99b84ebb79968269835a4f509bfb90 Mon Sep 17 00:00:00 2001 From: Perttu Ahola Date: Mon, 14 Nov 2011 00:19:48 +0200 Subject: Create framework for getting rid of global definitions of node/tool/item/whatever types --- src/materials.cpp | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) (limited to 'src/materials.cpp') diff --git a/src/materials.cpp b/src/materials.cpp index d905ca291..e990371ee 100644 --- a/src/materials.cpp +++ b/src/materials.cpp @@ -3,29 +3,28 @@ #include "mapnode_contentfeatures.h" #include "tool.h" -DiggingProperties getDiggingProperties(u16 material, const std::string &tool) +DiggingProperties getDiggingProperties(u16 material, ToolDiggingProperties *tp) { + assert(tp); MaterialProperties &mp = content_features(material).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; -- cgit v1.2.3