summaryrefslogtreecommitdiffstats
path: root/src/BlockID.cpp
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/BlockID.cpp53
1 files changed, 1 insertions, 52 deletions
diff --git a/src/BlockID.cpp b/src/BlockID.cpp
index d145a2e5b..755c721db 100644
--- a/src/BlockID.cpp
+++ b/src/BlockID.cpp
@@ -17,7 +17,7 @@ class cBlockIDMap
// Making the map case-insensitive:
struct Comparator
{
- bool operator()(const AString & a_Item1, const AString & a_Item2) const
+ bool operator ()(const AString & a_Item1, const AString & a_Item2) const
{
return (NoCaseCompare(a_Item1, a_Item2) > 0);
}
@@ -253,57 +253,6 @@ AString ItemToFullString(const cItem & a_Item)
-int StringToMobType(const AString & a_MobString)
-{
- static struct
- {
- int m_MobType;
- const char * m_String;
- } MobMap [] =
- {
- {cMonster::mtCreeper, "Creeper"},
- {cMonster::mtSkeleton, "Skeleton"},
- {cMonster::mtSpider, "Spider"},
- {cMonster::mtGiant, "Giant"},
- {cMonster::mtZombie, "Zombie"},
- {cMonster::mtSlime, "Slime"},
- {cMonster::mtGhast, "Ghast"},
- {cMonster::mtZombiePigman, "ZombiePigman"},
- {cMonster::mtEnderman, "Enderman"},
- {cMonster::mtCaveSpider, "CaveSpider"},
- {cMonster::mtSilverfish, "SilverFish"},
- {cMonster::mtBlaze, "Blaze"},
- {cMonster::mtMagmaCube, "MagmaCube"},
- {cMonster::mtEnderDragon, "EnderDragon"},
- {cMonster::mtWither, "Wither"},
- {cMonster::mtBat, "Bat"},
- {cMonster::mtWitch, "Witch"},
- {cMonster::mtPig, "Pig"},
- {cMonster::mtSheep, "Sheep"},
- {cMonster::mtCow, "Cow"},
- {cMonster::mtChicken, "Chicken"},
- {cMonster::mtSquid, "Squid"},
- {cMonster::mtWolf, "Wolf"},
- {cMonster::mtMooshroom, "Mooshroom"},
- {cMonster::mtSnowGolem, "SnowGolem"},
- {cMonster::mtOcelot, "Ocelot"},
- {cMonster::mtIronGolem, "IronGolem"},
- {cMonster::mtVillager, "Villager"},
- };
- for (size_t i = 0; i < ARRAYCOUNT(MobMap); i++)
- {
- if (NoCaseCompare(MobMap[i].m_String, a_MobString) == 0)
- {
- return MobMap[i].m_MobType;
- }
- } // for i - MobMap[]
- return -1;
-}
-
-
-
-
-
eDimension StringToDimension(const AString & a_DimensionString)
{
// First try decoding as a number