diff options
Diffstat (limited to 'source/Mobs/PassiveMonster.cpp')
| -rw-r--r-- | source/Mobs/PassiveMonster.cpp | 35 |
1 files changed, 23 insertions, 12 deletions
diff --git a/source/Mobs/PassiveMonster.cpp b/source/Mobs/PassiveMonster.cpp index bc3f70b4b..6224b284a 100644 --- a/source/Mobs/PassiveMonster.cpp +++ b/source/Mobs/PassiveMonster.cpp @@ -8,39 +8,50 @@ -cPassiveMonster::cPassiveMonster() +cPassiveMonster::cPassiveMonster(void) { m_EMPersonality = PASSIVE; } -cPassiveMonster::~cPassiveMonster() -{ -} -void cPassiveMonster::TakeDamage(int a_Damage, cEntity* a_Instigator) + + + +void cPassiveMonster::DoTakeDamage(TakeDamageInfo & a_TDI) { - cMonster::TakeDamage(a_Damage, a_Instigator); - if(a_Instigator != this) + super::DoTakeDamage(a_TDI); + if ((a_TDI.Attacker != this) && (a_TDI.Attacker != NULL)) + { m_EMState = ESCAPING; + } } + + + + void cPassiveMonster::Tick(float a_Dt) { cMonster::Tick(a_Dt); m_SeePlayerInterval += a_Dt; - if(m_SeePlayerInterval > 1) + if (m_SeePlayerInterval > 1) // Check every second { MTRand r1; - int rem = r1.randInt() % 3 + 1; //check most of the time but miss occasionally + int rem = r1.randInt() % 3 + 1; // Check most of the time but miss occasionally m_SeePlayerInterval = 0.0; - if(rem >= 2) { - if(m_EMState == ESCAPING) + if (rem >= 2) + { + if (m_EMState == ESCAPING) { CheckEventLostPlayer(); } } } -}
\ No newline at end of file +} + + + + |