summaryrefslogtreecommitdiffstats
path: root/source/Mobs
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@hotmail.co.uk>2013-10-11 21:57:22 +0200
committerTiger Wang <ziwei.tiger@hotmail.co.uk>2013-10-11 21:57:22 +0200
commite2aaf202abf9d677b84efeb376f55ee976b52b8d (patch)
treeabb93c8bf233ffe877ba2d50c61be8768e9cc994 /source/Mobs
parentFourth round of fixes (diff)
downloadcuberite-e2aaf202abf9d677b84efeb376f55ee976b52b8d.tar
cuberite-e2aaf202abf9d677b84efeb376f55ee976b52b8d.tar.gz
cuberite-e2aaf202abf9d677b84efeb376f55ee976b52b8d.tar.bz2
cuberite-e2aaf202abf9d677b84efeb376f55ee976b52b8d.tar.lz
cuberite-e2aaf202abf9d677b84efeb376f55ee976b52b8d.tar.xz
cuberite-e2aaf202abf9d677b84efeb376f55ee976b52b8d.tar.zst
cuberite-e2aaf202abf9d677b84efeb376f55ee976b52b8d.zip
Diffstat (limited to '')
-rw-r--r--source/Mobs/Villager.cpp4
-rw-r--r--source/Mobs/Villager.h15
2 files changed, 15 insertions, 4 deletions
diff --git a/source/Mobs/Villager.cpp b/source/Mobs/Villager.cpp
index cb50d8cfc..97d6dc3ca 100644
--- a/source/Mobs/Villager.cpp
+++ b/source/Mobs/Villager.cpp
@@ -8,9 +8,9 @@
-cVillager::cVillager(int Type) :
+cVillager::cVillager(eVillagerType VillagerType) :
super("Villager", 120, "", "", 0.6, 1.8),
- m_Type(Type)
+ m_Type(VillagerType)
{
}
diff --git a/source/Mobs/Villager.h b/source/Mobs/Villager.h
index 5fcb519dd..86888d9eb 100644
--- a/source/Mobs/Villager.h
+++ b/source/Mobs/Villager.h
@@ -13,12 +13,23 @@ class cVillager :
typedef cPassiveMonster super;
public:
- cVillager(int Type);
+
+ 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
+ } ;
+
+ cVillager(eVillagerType VillagerType);
CLASS_PROTODEF(cVillager);
virtual void DoTakeDamage(TakeDamageInfo & a_TDI) override;
- int GetVilType(void) const { return m_Type; }
+ int GetVilType(void) const { return m_Type; }
private: