From 912a1e7adc650d20b0302a3dfe45816b5e541bc7 Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Fri, 21 Dec 2012 11:04:08 +0000 Subject: Refactored the TakeDamage API to take equipped weapon and armor into consideration (PvP untested) http://forum.mc-server.org/showthread.php?tid=625 git-svn-id: http://mc-server.googlecode.com/svn/trunk@1087 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/Mobs/PassiveAggressiveMonster.cpp | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) (limited to 'source/Mobs/PassiveAggressiveMonster.cpp') 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 + + + -- cgit v1.2.3