From 0cb00996de574095fac49e181a11e6a766248743 Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Fri, 16 Aug 2013 10:48:19 +0200
Subject: Replaced E_ENTITY_TYPE_XXX with cMonster::mtXXX.

Also slightly improved the spawning algorithm.
---
 source/BlockID.cpp | 67 +++++++++++++++++++++++++++---------------------------
 1 file changed, 34 insertions(+), 33 deletions(-)

(limited to 'source/BlockID.cpp')

diff --git a/source/BlockID.cpp b/source/BlockID.cpp
index 05506777c..4b4fe5876 100644
--- a/source/BlockID.cpp
+++ b/source/BlockID.cpp
@@ -7,6 +7,7 @@
 #include "BlockID.h"
 #include "../iniFile/iniFile.h"
 #include "Item.h"
+#include "Mobs/Monster.h"
 
 
 
@@ -287,10 +288,10 @@ EMCSBiome StringToBiome(const AString & a_BiomeString)
 		{biTaiga,            "Taiga"},
 		{biSwampland,        "Swampland"},
 		{biRiver,            "River"},
-		{biHell,             "Hell"},
-		{biHell,             "Nether"},
-		{biSky,              "Sky"},
-		{biSky,              "End"},
+		{biNether,           "Hell"},
+		{biNether,           "Nether"},
+		{biEnd,              "Sky"},
+		{biEnd,              "End"},
 		{biFrozenOcean,      "FrozenOcean"},
 		{biFrozenRiver,      "FrozenRiver"},
 		{biIcePlains,        "IcePlains"},
@@ -328,34 +329,34 @@ int StringToMobType(const AString & a_MobString)
 		const char * m_String;
 	} MobMap [] =
 	{
-		{E_ENTITY_TYPE_CREEPER,       "Creeper"},
-		{E_ENTITY_TYPE_SKELETON,      "Skeleton"},
-		{E_ENTITY_TYPE_SPIDER,        "Spider"},
-		{E_ENTITY_TYPE_GIANT,         "Giant"},
-		{E_ENTITY_TYPE_ZOMBIE,        "Zombie"},
-		{E_ENTITY_TYPE_SLIME,         "Slime"},
-		{E_ENTITY_TYPE_GHAST,         "Ghast"},
-		{E_ENTITY_TYPE_ZOMBIE_PIGMAN, "ZombiePigman"},
-		{E_ENTITY_TYPE_ENDERMAN,      "Enderman"},
-		{E_ENTITY_TYPE_CAVE_SPIDER,   "CaveSpider"},
-		{E_ENTITY_TYPE_SILVERFISH,    "SilverFish"},
-		{E_ENTITY_TYPE_BLAZE,         "Blaze"},
-		{E_ENTITY_TYPE_MAGMA_CUBE,    "MagmaCube"},
-		{E_ENTITY_TYPE_ENDER_DRAGON,  "EnderDragon"},
-		{E_ENTITY_TYPE_WITHER,        "Wither"},
-		{E_ENTITY_TYPE_BAT,           "Bat"},
-		{E_ENTITY_TYPE_WITCH,         "Witch"},
-		{E_ENTITY_TYPE_PIG,           "Pig"},
-		{E_ENTITY_TYPE_SHEEP,         "Sheep"},
-		{E_ENTITY_TYPE_COW,           "Cow"},
-		{E_ENTITY_TYPE_CHICKEN,       "Chicken"},
-		{E_ENTITY_TYPE_SQUID,         "Squid"},
-		{E_ENTITY_TYPE_WOLF,          "Wolf"},
-		{E_ENTITY_TYPE_MOOSHROOM,     "Mushroom"},
-		{E_ENTITY_TYPE_SNOW_GOLEM,    "SnowGolem"},
-		{E_ENTITY_TYPE_OCELOT,        "Ocelot"},
-		{E_ENTITY_TYPE_IRON_GOLEM,    "IronGolem"}, 
-		{E_ENTITY_TYPE_VILLAGER,      "Villager"},
+		{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 (int i = 0; i < ARRAYCOUNT(MobMap); i++)
 	{
@@ -364,7 +365,7 @@ int StringToMobType(const AString & a_MobString)
 			return MobMap[i].m_MobType;
 		}
 	}  // for i - MobMap[]
-	return (int)-1;
+	return -1;
 }
 
 
-- 
cgit v1.2.3