From 0cb00996de574095fac49e181a11e6a766248743 Mon Sep 17 00:00:00 2001 From: madmaxoft 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/Mobs/Monster.h | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) (limited to 'source/Mobs/Monster.h') diff --git a/source/Mobs/Monster.h b/source/Mobs/Monster.h index ea7f935ea..b821285a0 100644 --- a/source/Mobs/Monster.h +++ b/source/Mobs/Monster.h @@ -3,7 +3,6 @@ #include "../Pawn.h" #include "../Defines.h" -#include "../World.h" #include "../BlockID.h" #include "../Item.h" @@ -13,6 +12,7 @@ class Vector3f; class cClientHandle; +class cWorld; @@ -23,7 +23,41 @@ class cMonster : { typedef cPawn super; public: + /// This identifies individual monster type, as well as their network type-ID + enum eType + { + 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, + 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, + 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, + 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, + mtSnowGolem = E_META_SPAWN_EGG_SNOW_GOLEM, + mtOcelot = E_META_SPAWN_EGG_OCELOT, + mtIronGolem = E_META_SPAWN_EGG_IRON_GOLEM, + mtVillager = E_META_SPAWN_EGG_VILLAGER, + } ; + // tolua_end + float m_SightDistance; /** Creates the mob object. -- cgit v1.2.3