summaryrefslogtreecommitdiff
path: root/src/tool.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/tool.h')
-rw-r--r--src/tool.h15
1 files changed, 6 insertions, 9 deletions
diff --git a/src/tool.h b/src/tool.h
index 509561a16..ebba5b749 100644
--- a/src/tool.h
+++ b/src/tool.h
@@ -23,12 +23,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "irrlichttypes.h"
#include <string>
#include <iostream>
-#include <map>
+#include "util/cpp11_container.h"
#include "itemgroup.h"
struct ToolGroupCap
{
- std::map<int, float> times;
+ UNORDERED_MAP<int, float> times;
int maxlevel;
int uses;
@@ -39,8 +39,8 @@ struct ToolGroupCap
bool getTime(int rating, float *time) const
{
- std::map<int, float>::const_iterator i = times.find(rating);
- if(i == times.end()){
+ UNORDERED_MAP<int, float>::const_iterator i = times.find(rating);
+ if (i == times.end()) {
*time = 0;
return false;
}
@@ -50,22 +50,19 @@ struct ToolGroupCap
};
-// CLANG SUCKS DONKEY BALLS
-typedef std::map<std::string, struct ToolGroupCap> ToolGCMap;
-typedef std::map<std::string, s16> DamageGroup;
+typedef UNORDERED_MAP<std::string, struct ToolGroupCap> ToolGCMap;
+typedef UNORDERED_MAP<std::string, s16> DamageGroup;
struct ToolCapabilities
{
float full_punch_interval;
int max_drop_level;
- // CLANG SUCKS DONKEY BALLS
ToolGCMap groupcaps;
DamageGroup damageGroups;
ToolCapabilities(
float full_punch_interval_=1.4,
int max_drop_level_=1,
- // CLANG SUCKS DONKEY BALLS
ToolGCMap groupcaps_=ToolGCMap(),
DamageGroup damageGroups_=DamageGroup()
):