Modernize client code (#6250)

[oweals/minetest.git] / src / tool.h

diff --git a/src/tool.h b/src/tool.h
index f33152355c21e3cf5f9f3dc3bfa14c99195a1493..67631fe79beb4c2ddcc60a867befde9c7c45c327 100644 (file)
--- a/src/tool.h
+++ b/src/tool.h
@@ -23,23 +23,19 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #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 +46,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
 {
@@ -119,15 +115,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;