Dungeongen: Fix out-of-voxelmanip access segfault

[minetest.git] / src / tool.cpp

diff --git a/src/tool.cpp b/src/tool.cpp
index 4d809e2c44ffc75e3e1e374a439004b19a2d8462..20b71fb316faf8e635dd9ef6fb1b41a5f4d4ee4c 100644 (file)
--- a/src/tool.cpp
+++ b/src/tool.cpp
@@ -18,9 +18,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 */
 
 #include "tool.h"
-#include "itemdef.h" // For itemgroup_get()
+#include "itemgroup.h"
 #include "log.h"
 #include "inventory.h"
+#include "exceptions.h"
 #include "util/serialize.h"
 #include "util/numeric.h"
 
@@ -33,24 +34,23 @@ void ToolCapabilities::serialize(std::ostream &os, u16 protocol_version) const
        writeF1000(os, full_punch_interval);
        writeS16(os, max_drop_level);
        writeU32(os, groupcaps.size());
-       for(std::map<std::string, ToolGroupCap>::const_iterator
-                       i = groupcaps.begin(); i != groupcaps.end(); i++){
+       for (ToolGCMap::const_iterator i = groupcaps.begin(); i != groupcaps.end(); ++i) {
                const std::string *name = &i->first;
                const ToolGroupCap *cap = &i->second;
                os<<serializeString(*name);
                writeS16(os, cap->uses);
                writeS16(os, cap->maxlevel);
                writeU32(os, cap->times.size());
-               for(std::map<int, float>::const_iterator
-                               i = cap->times.begin(); i != cap->times.end(); i++){
+               for (UNORDERED_MAP<int, float>::const_iterator
+                               i = cap->times.begin(); i != cap->times.end(); ++i) {
                        writeS16(os, i->first);
                        writeF1000(os, i->second);
                }
        }
        if(protocol_version > 17){
                writeU32(os, damageGroups.size());
-               for(std::map<std::string, s16>::const_iterator
-                               i = damageGroups.begin(); i != damageGroups.end(); i++){
+               for (DamageGroup::const_iterator i = damageGroups.begin();
+                               i != damageGroups.end(); ++i) {
                        os<<serializeString(i->first);
                        writeS16(os, i->second);
                }
@@ -105,7 +105,7 @@ DigParams getDigParams(const ItemGroupList &groups,
        default:
                break;
        }
-       
+
        // Values to be returned (with a bit of conversion)
        bool result_diggable = false;
        float result_time = 0.0;
@@ -114,8 +114,8 @@ DigParams getDigParams(const ItemGroupList &groups,
 
        int level = itemgroup_get(groups, "level");
        //infostream<<"level="<<level<<std::endl;
-       for(std::map<std::string, ToolGroupCap>::const_iterator
-                       i = tp->groupcaps.begin(); i != tp->groupcaps.end(); i++){
+       for (ToolGCMap::const_iterator i = tp->groupcaps.begin();
+                       i != tp->groupcaps.end(); ++i) {
                const std::string &name = i->first;
                //infostream<<"group="<<name<<std::endl;
                const ToolGroupCap &cap = i->second;
@@ -162,10 +162,10 @@ HitParams getHitParams(const ItemGroupList &armor_groups,
        s16 damage = 0;
        float full_punch_interval = tp->full_punch_interval;
 
-       for(std::map<std::string, s16>::const_iterator
-                       i = tp->damageGroups.begin(); i != tp->damageGroups.end(); i++){
+       for (DamageGroup::const_iterator i = tp->damageGroups.begin();
+                       i != tp->damageGroups.end(); ++i) {
                s16 armor = itemgroup_get(armor_groups, i->first);
-               damage += i->second * rangelim(time_from_last_punch * full_punch_interval, 0.0, 1.0)
+               damage += i->second * rangelim(time_from_last_punch / full_punch_interval, 0.0, 1.0)
                                * armor / 100.0;
        }
 
@@ -196,7 +196,7 @@ PunchDamageResult getPunchDamage(
                                do_hit = false;
                }
        }
-       
+
        PunchDamageResult result;
        if(do_hit)
        {