Code modernization: src/p*, src/q*, src/r*, src/s* (partial) (#6282)

[dragonfireclient.git] / src / tool.h

diff --git a/src/tool.h b/src/tool.h
index ebba5b7490fb78ee63cbda07810c3ade9d4a032f..f3362d8928112c59fffc0baf5897934570bc105d 100644 (file)
--- a/src/tool.h
+++ b/src/tool.h
@@ -17,29 +17,24 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef TOOL_HEADER
-#define TOOL_HEADER
+#pragma once
 
 #include "irrlichttypes.h"
 #include <string>
 #include <iostream>
-#include "util/cpp11_container.h"
 #include "itemgroup.h"
 
 struct ToolGroupCap
 {
-       UNORDERED_MAP<int, float> times;
-       int maxlevel;
-       int uses;
+       std::unordered_map<int, float> times;
+       int maxlevel = 1;
+       int uses = 20;
 
-       ToolGroupCap():
-               maxlevel(1),
-               uses(20)
-       {}
+       ToolGroupCap() {}
 
        bool getTime(int rating, float *time) const
        {
-               UNORDERED_MAP<int, float>::const_iterator i = times.find(rating);
+               std::unordered_map<int, float>::const_iterator i = times.find(rating);
                if (i == times.end()) {
                        *time = 0;
                        return false;
@@ -50,8 +45,8 @@ struct ToolGroupCap
 };
 
 
-typedef UNORDERED_MAP<std::string, struct ToolGroupCap> ToolGCMap;
-typedef UNORDERED_MAP<std::string, s16> DamageGroup;
+typedef std::unordered_map<std::string, struct ToolGroupCap> ToolGCMap;
+typedef std::unordered_map<std::string, s16> DamageGroup;
 
 struct ToolCapabilities
 {
@@ -63,8 +58,8 @@ struct ToolCapabilities
        ToolCapabilities(
                        float full_punch_interval_=1.4,
                        int max_drop_level_=1,
-                       ToolGCMap groupcaps_=ToolGCMap(),
-                       DamageGroup damageGroups_=DamageGroup()
+                       const ToolGCMap &groupcaps_ = ToolGCMap(),
+                       const DamageGroup &damageGroups_ = DamageGroup()
        ):
                full_punch_interval(full_punch_interval_),
                max_drop_level(max_drop_level_),
@@ -85,8 +80,8 @@ struct DigParams
        u16 wear;
        std::string main_group;
 
-       DigParams(bool a_diggable=false, float a_time=0, u16 a_wear=0,
-                       std::string a_main_group=""):
+       DigParams(bool a_diggable = false, float a_time = 0.0f, u16 a_wear = 0,
+                       const std::string &a_main_group = ""):
                diggable(a_diggable),
                time(a_time),
                wear(a_wear),
@@ -119,15 +114,11 @@ HitParams getHitParams(const ItemGroupList &armor_groups,
 
 struct PunchDamageResult
 {
-       bool did_punch;
-       int damage;
-       int wear;
-
-       PunchDamageResult():
-               did_punch(false),
-               damage(0),
-               wear(0)
-       {}
+       bool did_punch = false;
+       int damage = 0;
+       int wear = 0;
+
+       PunchDamageResult() {}
 };
 
 struct ItemStack;
@@ -138,6 +129,3 @@ PunchDamageResult getPunchDamage(
                const ItemStack *punchitem,
                float time_from_last_punch
 );
-
-#endif
-