summaryrefslogtreecommitdiffstats
path: root/source/Mobs
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@hotmail.co.uk>2013-10-13 13:47:55 +0200
committerTiger Wang <ziwei.tiger@hotmail.co.uk>2013-10-13 13:47:55 +0200
commitd8d2f35e9dd354fba14f8d6512e818d18d2066c2 (patch)
tree159374402a90eb8a6b15e5a4bef2ea2d854985fa /source/Mobs
parentSeventh round of fixes (diff)
downloadcuberite-d8d2f35e9dd354fba14f8d6512e818d18d2066c2.tar
cuberite-d8d2f35e9dd354fba14f8d6512e818d18d2066c2.tar.gz
cuberite-d8d2f35e9dd354fba14f8d6512e818d18d2066c2.tar.bz2
cuberite-d8d2f35e9dd354fba14f8d6512e818d18d2066c2.tar.lz
cuberite-d8d2f35e9dd354fba14f8d6512e818d18d2066c2.tar.xz
cuberite-d8d2f35e9dd354fba14f8d6512e818d18d2066c2.tar.zst
cuberite-d8d2f35e9dd354fba14f8d6512e818d18d2066c2.zip
Diffstat (limited to '')
-rw-r--r--source/Mobs/Monster.cpp2
-rw-r--r--source/Mobs/Villager.h13
2 files changed, 8 insertions, 7 deletions
diff --git a/source/Mobs/Monster.cpp b/source/Mobs/Monster.cpp
index 76b9414f7..334229a42 100644
--- a/source/Mobs/Monster.cpp
+++ b/source/Mobs/Monster.cpp
@@ -24,7 +24,7 @@
cMonster::cMonster(const AString & a_ConfigName, char a_ProtocolMobType, const AString & a_SoundHurt, const AString & a_SoundDeath, double a_Width, double a_Height)
- : super(etMob, a_Width, a_Height)
+ : super(etMonster, a_Width, a_Height)
, m_Target(NULL)
, m_AttackRate(3)
, idle_interval(0)
diff --git a/source/Mobs/Villager.h b/source/Mobs/Villager.h
index 86888d9eb..4cd9aaa8e 100644
--- a/source/Mobs/Villager.h
+++ b/source/Mobs/Villager.h
@@ -16,12 +16,13 @@ public:
enum eVillagerType
{
- VILLAGER_TYPE_FARMER = 0,
- VILLAGER_TYPE_LIBRARIAN = 1,
- VILLAGER_TYPE_PRIEST = 2,
- VILLAGER_TYPE_BLACKSMITH = 3,
- VILLAGER_TYPE_BUTCHER = 4,
- VILLAGER_TYPE_GENERIC = 5
+ vtFarmer = 0,
+ vtLibrarian = 1,
+ vtPriest = 2,
+ vtBlacksmith = 3,
+ vtButcher = 4,
+ vtGeneric = 5,
+ vtMax
} ;
cVillager(eVillagerType VillagerType);