summaryrefslogtreecommitdiffstats
path: root/source/Mobs/Villager.cpp
diff options
context:
space:
mode:
authormadmaxoft <github@xoft.cz>2013-10-13 18:26:45 +0200
committermadmaxoft <github@xoft.cz>2013-10-13 18:26:45 +0200
commite62cac07c0d74ded6109b9221045d65223b05c23 (patch)
treea1011589b593aa387a434501b40fb99de0d0a502 /source/Mobs/Villager.cpp
parentMerge pull request #226 from SamJBarney/master (diff)
parentEight round of fixes (diff)
downloadcuberite-e62cac07c0d74ded6109b9221045d65223b05c23.tar
cuberite-e62cac07c0d74ded6109b9221045d65223b05c23.tar.gz
cuberite-e62cac07c0d74ded6109b9221045d65223b05c23.tar.bz2
cuberite-e62cac07c0d74ded6109b9221045d65223b05c23.tar.lz
cuberite-e62cac07c0d74ded6109b9221045d65223b05c23.tar.xz
cuberite-e62cac07c0d74ded6109b9221045d65223b05c23.tar.zst
cuberite-e62cac07c0d74ded6109b9221045d65223b05c23.zip
Diffstat (limited to 'source/Mobs/Villager.cpp')
-rw-r--r--source/Mobs/Villager.cpp22
1 files changed, 20 insertions, 2 deletions
diff --git a/source/Mobs/Villager.cpp b/source/Mobs/Villager.cpp
index 98e5276e1..97d6dc3ca 100644
--- a/source/Mobs/Villager.cpp
+++ b/source/Mobs/Villager.cpp
@@ -2,16 +2,34 @@
#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
#include "Villager.h"
+#include "../World.h"
-cVillager::cVillager(void) :
- super("Villager", 120, "", "", 0.6, 1.8)
+cVillager::cVillager(eVillagerType VillagerType) :
+ super("Villager", 120, "", "", 0.6, 1.8),
+ m_Type(VillagerType)
{
}
+
+void cVillager::DoTakeDamage(TakeDamageInfo & a_TDI)
+{
+ super::DoTakeDamage(a_TDI);
+ if (a_TDI.Attacker->IsPlayer())
+ {
+ if (m_World->GetTickRandomNumber(5) == 3)
+ {
+ m_World->BroadcastEntityStatus(*this, ENTITY_STATUS_VILLAGER_ANGRY);
+ }
+ }
+}
+
+
+
+