diff options
| author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2013-10-08 20:20:49 +0200 |
|---|---|---|
| committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2013-10-08 20:20:49 +0200 |
| commit | 5db6213f34318031ece7e2a6765f69564b671891 (patch) | |
| tree | 074213cf13247c4e6370528eaa000bbd4b3a625d /source/Mobs/Villager.cpp | |
| parent | Merge pull request #2 from tigerw/bugfixes (diff) | |
| download | cuberite-5db6213f34318031ece7e2a6765f69564b671891.tar cuberite-5db6213f34318031ece7e2a6765f69564b671891.tar.gz cuberite-5db6213f34318031ece7e2a6765f69564b671891.tar.bz2 cuberite-5db6213f34318031ece7e2a6765f69564b671891.tar.lz cuberite-5db6213f34318031ece7e2a6765f69564b671891.tar.xz cuberite-5db6213f34318031ece7e2a6765f69564b671891.tar.zst cuberite-5db6213f34318031ece7e2a6765f69564b671891.zip | |
Diffstat (limited to 'source/Mobs/Villager.cpp')
| -rw-r--r-- | source/Mobs/Villager.cpp | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/source/Mobs/Villager.cpp b/source/Mobs/Villager.cpp index 98e5276e1..cb50d8cfc 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(int Type) : + super("Villager", 120, "", "", 0.6, 1.8), + m_Type(Type) { } + +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); + } + } +} + + + + |