1 files changed, 24 insertions, 22 deletions

diff --git a/source/Mobs/Monster.h b/source/Mobs/Monster.h
index 82fc4b6fc..b2676f5b1 100644
--- a/source/Mobs/Monster.h
+++ b/source/Mobs/Monster.h
@@ -26,34 +26,36 @@ public:
 	/// This identifies individual monster type, as well as their network type-ID
 	enum eType
 	{
+		mtBat          = E_META_SPAWN_EGG_BAT,
+		mtBlaze        = E_META_SPAWN_EGG_BLAZE,
+		mtCaveSpider   = E_META_SPAWN_EGG_CAVE_SPIDER,
+		mtChicken      = E_META_SPAWN_EGG_CHICKEN,
+		mtCow          = E_META_SPAWN_EGG_COW,
 		mtCreeper      = E_META_SPAWN_EGG_CREEPER,
-		mtSkeleton     = E_META_SPAWN_EGG_SKELETON,
-		mtSpider       = E_META_SPAWN_EGG_SPIDER,
-		mtGiant        = E_META_SPAWN_EGG_GIANT,
-		mtZombie       = E_META_SPAWN_EGG_ZOMBIE,
-		mtSlime        = E_META_SPAWN_EGG_SLIME,
-		mtGhast        = E_META_SPAWN_EGG_GHAST,
-		mtZombiePigman = E_META_SPAWN_EGG_ZOMBIE_PIGMAN,
+		mtEnderDragon  = E_META_SPAWN_EGG_ENDER_DRAGON,
 		mtEnderman     = E_META_SPAWN_EGG_ENDERMAN,
-		mtCaveSpider   = E_META_SPAWN_EGG_CAVE_SPIDER,
-		mtSilverfish   = E_META_SPAWN_EGG_SILVERFISH,
-		mtBlaze        = E_META_SPAWN_EGG_BLAZE,
+		mtGhast        = E_META_SPAWN_EGG_GHAST,
+		mtGiant        = E_META_SPAWN_EGG_GIANT,
+		mtHorse        = E_META_SPAWN_EGG_HORSE,
+		mtIronGolem    = E_META_SPAWN_EGG_IRON_GOLEM,
 		mtMagmaCube    = E_META_SPAWN_EGG_MAGMA_CUBE,
-		mtEnderDragon  = E_META_SPAWN_EGG_ENDER_DRAGON,
-		mtWither       = E_META_SPAWN_EGG_WITHER,
-		mtBat          = E_META_SPAWN_EGG_BAT,
-		mtWitch        = E_META_SPAWN_EGG_WITCH,
+		mtMooshroom    = E_META_SPAWN_EGG_MOOSHROOM,
+		mtOcelot       = E_META_SPAWN_EGG_OCELOT,
 		mtPig          = E_META_SPAWN_EGG_PIG,
 		mtSheep        = E_META_SPAWN_EGG_SHEEP,
-		mtCow          = E_META_SPAWN_EGG_COW,
-		mtChicken      = E_META_SPAWN_EGG_CHICKEN,
-		mtSquid        = E_META_SPAWN_EGG_SQUID,
-		mtWolf         = E_META_SPAWN_EGG_WOLF,
-		mtMooshroom    = E_META_SPAWN_EGG_MOOSHROOM,
+		mtSilverfish   = E_META_SPAWN_EGG_SILVERFISH,
+		mtSkeleton     = E_META_SPAWN_EGG_SKELETON,
+		mtSlime        = E_META_SPAWN_EGG_SLIME,
 		mtSnowGolem    = E_META_SPAWN_EGG_SNOW_GOLEM,
-		mtOcelot       = E_META_SPAWN_EGG_OCELOT,
-		mtIronGolem    = E_META_SPAWN_EGG_IRON_GOLEM,
+		mtSpider       = E_META_SPAWN_EGG_SPIDER,
+		mtSquid        = E_META_SPAWN_EGG_SQUID,
 		mtVillager     = E_META_SPAWN_EGG_VILLAGER,
+		mtWitch        = E_META_SPAWN_EGG_WITCH,
+		mtWither       = E_META_SPAWN_EGG_WITHER,
+		mtWolf         = E_META_SPAWN_EGG_WOLF,
+		mtZombie       = E_META_SPAWN_EGG_ZOMBIE,
+		mtZombiePigman = E_META_SPAWN_EGG_ZOMBIE_PIGMAN,
+
 	} ;
 	
 	// tolua_end
@@ -110,7 +112,7 @@ public:
 	void SetSightDistance(float sd);
 	
 	/// Sets whether the mob burns in daylight. Only evaluated at next burn-decision tick
-	void SetBurnsInDaylight(bool a_BurnsInDaylight) { a_BurnsInDaylight = a_BurnsInDaylight; }
+	void SetBurnsInDaylight(bool a_BurnsInDaylight) { m_BurnsInDaylight = a_BurnsInDaylight; }
 	
 	enum MState{ATTACKING, IDLE, CHASING, ESCAPING} m_EMState;
 	enum MPersonality{PASSIVE,AGGRESSIVE,COWARDLY} m_EMPersonality;