Snake case for screen options in minetest.conf (#5792)

[minetest.git] / src / tool.cpp

diff --git a/src/tool.cpp b/src/tool.cpp
index f3b3e656f8766d546e7d90a1d0abf758baa5bb57..bb884938c8eb6a66642f0b0e6c7a6c129f18b09c 100644 (file)
--- a/src/tool.cpp
+++ b/src/tool.cpp
@@ -27,34 +27,30 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 void ToolCapabilities::serialize(std::ostream &os, u16 protocol_version) const
 {
-       if(protocol_version <= 17)
-               writeU8(os, 1); // version
-       else
-               writeU8(os, 2); // version
+       writeU8(os, 2); // version (protocol >= 18)
        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);
+               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++){
-                       writeS16(os, i->first);
-                       writeF1000(os, i->second);
+               for (UNORDERED_MAP<int, float>::const_iterator
+                               j = cap->times.begin(); j != cap->times.end(); ++j) {
+                       writeS16(os, j->first);
+                       writeF1000(os, j->second);
                }
        }
-       if(protocol_version > 17){
-               writeU32(os, damageGroups.size());
-               for(std::map<std::string, s16>::const_iterator
-                               i = damageGroups.begin(); i != damageGroups.end(); i++){
-                       os<<serializeString(i->first);
-                       writeS16(os, i->second);
-               }
+
+       writeU32(os, damageGroups.size());
+
+       for (DamageGroup::const_iterator i = damageGroups.begin();
+                       i != damageGroups.end(); ++i) {
+               os << serializeString(i->first);
+               writeS16(os, i->second);
        }
 }
 
@@ -102,11 +98,11 @@ DigParams getDigParams(const ItemGroupList &groups,
                return DigParams(true, 0.5, 0, "dig_immediate");
        case 3:
                //infostream<<"dig_immediate=3"<<std::endl;
-               return DigParams(true, 0.0, 0, "dig_immediate");
+               return DigParams(true, 0, 0, "dig_immediate");
        default:
                break;
        }
-       
+
        // Values to be returned (with a bit of conversion)
        bool result_diggable = false;
        float result_time = 0.0;
@@ -115,8 +111,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;
@@ -163,10 +159,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;
        }
 
@@ -197,7 +193,7 @@ PunchDamageResult getPunchDamage(
                                do_hit = false;
                }
        }
-       
+
        PunchDamageResult result;
        if(do_hit)
        {