josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*Move AI function DamageTaken back to DealDamage.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-05-17 16:38:44 -05:00
parent c75e3d526b
commit b95e67375c
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/Unit.cpp
+5 -2
View File
@@ -564,8 +564,8 @@ void Unit::DealDamageMods(Unit *pVictim, uint32 &damage, uint32* absorb)
//if( GetTypeId()== TYPEID_UNIT && ((Creature *)this)->AI()) //if( GetTypeId()== TYPEID_UNIT && ((Creature *)this)->AI())
// ((Creature *)this)->AI()->DamageDeal(pVictim, damage); // ((Creature *)this)->AI()->DamageDeal(pVictim, damage);
//Script Event damage taken //Script Event damage taken
if( pVictim->GetTypeId()== TYPEID_UNIT && ((Creature *)pVictim)->IsAIEnabled ) //if( pVictim->GetTypeId()== TYPEID_UNIT && ((Creature *)pVictim)->IsAIEnabled )
((Creature *)pVictim)->AI()->DamageTaken(this, damage); // ((Creature *)pVictim)->AI()->DamageTaken(this, damage);
if(absorb && originalDamage > damage) if(absorb && originalDamage > damage)
absorb += (originalDamage - damage); absorb += (originalDamage - damage);
@@ -575,6 +575,9 @@ uint32 Unit::DealDamage(Unit *pVictim, uint32 damage, CleanDamage const* cleanDa
{ {
if( pVictim->GetTypeId()== TYPEID_UNIT) if( pVictim->GetTypeId()== TYPEID_UNIT)
{ {
if(((Creature *)pVictim)->IsAIEnabled)
((Creature *)pVictim)->AI()->DamageTaken(this, damage);
// Set tagging // Set tagging
if(!pVictim->HasFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_OTHER_TAGGER) && !((Creature*)pVictim)->isPet()) if(!pVictim->HasFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_OTHER_TAGGER) && !((Creature*)pVictim)->isPet())
{ {