diff options
| author | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-12-21 12:04:08 +0100 |
|---|---|---|
| committer | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-12-21 12:04:08 +0100 |
| commit | 912a1e7adc650d20b0302a3dfe45816b5e541bc7 (patch) | |
| tree | 65e7ffbf33d8f1335a4997fc5a727739f9dcdd34 /source/Mobs/PassiveAggressiveMonster.cpp | |
| parent | Extended player inventory by direct r/o access to armor slots (diff) | |
| download | cuberite-912a1e7adc650d20b0302a3dfe45816b5e541bc7.tar cuberite-912a1e7adc650d20b0302a3dfe45816b5e541bc7.tar.gz cuberite-912a1e7adc650d20b0302a3dfe45816b5e541bc7.tar.bz2 cuberite-912a1e7adc650d20b0302a3dfe45816b5e541bc7.tar.lz cuberite-912a1e7adc650d20b0302a3dfe45816b5e541bc7.tar.xz cuberite-912a1e7adc650d20b0302a3dfe45816b5e541bc7.tar.zst cuberite-912a1e7adc650d20b0302a3dfe45816b5e541bc7.zip | |
Diffstat (limited to 'source/Mobs/PassiveAggressiveMonster.cpp')
| -rw-r--r-- | source/Mobs/PassiveAggressiveMonster.cpp | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/source/Mobs/PassiveAggressiveMonster.cpp b/source/Mobs/PassiveAggressiveMonster.cpp index 9d9e156ee..465c302a1 100644 --- a/source/Mobs/PassiveAggressiveMonster.cpp +++ b/source/Mobs/PassiveAggressiveMonster.cpp @@ -9,30 +9,27 @@ -cPassiveAggressiveMonster::cPassiveAggressiveMonster() +cPassiveAggressiveMonster::cPassiveAggressiveMonster(void) { m_EMPersonality = PASSIVE; } -cPassiveAggressiveMonster::~cPassiveAggressiveMonster() -{ -} -void cPassiveAggressiveMonster::TakeDamage(int a_Damage, cEntity* a_Instigator) + + + +void cPassiveAggressiveMonster::DoTakeDamage(TakeDamageInfo & a_TDI) { - cMonster::TakeDamage(a_Damage, a_Instigator); - if(m_Target->GetEntityType() == cEntity::eEntityType_Player) + if ((m_Target != NULL) && (m_Target->GetEntityType() == cEntity::eEntityType_Player)) { cPlayer * Player = (cPlayer *) m_Target; - if(Player->GetGameMode() != 1) + if (Player->GetGameMode() != 1) { m_EMState = CHASING; } } - } -void cPassiveAggressiveMonster::EventSeePlayer(cEntity *a_Entity) -{ - return cMonster::EventSeePlayer(a_Entity); -}
\ No newline at end of file + + + |