From d407325b77de282ce591dc0d07d08384bc5ccad9 Mon Sep 17 00:00:00 2001 From: megamage Date: Fri, 24 Apr 2009 11:51:44 -0500 Subject: [7709] Cleanups in AI()->AttackedBy use. Author: VladimirMangos * Remove redundent AI()->AttackedBy call at melee cast in state update (called in cast) * Move attacks state update call after first attack instead after all extra attack state updates. --HG-- branch : trunk --- src/game/Unit.cpp | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 97bd836f5de..72fdd6c3fd2 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -2283,11 +2283,6 @@ void Unit::AttackerStateUpdate (Unit *pVictim, WeaponAttackType attType, bool ex --m_extraAttacks; } } - - // if damage pVictim call AI reaction - //if(pVictim->GetTypeId()==TYPEID_UNIT && ((Creature*)pVictim)->AI()) - // ((Creature*)pVictim)->AI()->AttackedBy(this); - return; } @@ -2308,6 +2303,10 @@ void Unit::AttackerStateUpdate (Unit *pVictim, WeaponAttackType attType, bool ex DEBUG_LOG("AttackerStateUpdate: (NPC) %u attacked %u (TypeId: %u) for %u dmg, absorbed %u, blocked %u, resisted %u.", GetGUIDLow(), pVictim->GetGUIDLow(), pVictim->GetTypeId(), damageInfo.damage, damageInfo.absorb, damageInfo.blocked_amount, damageInfo.resist); + // if damage pVictim call AI reaction + //if(pVictim->GetTypeId()==TYPEID_UNIT && ((Creature*)pVictim)->AI()) + // ((Creature*)pVictim)->AI()->AttackedBy(this); + // extra attack only at any non extra attack (normal case) if(!extra && extraAttacks) { @@ -2318,10 +2317,6 @@ void Unit::AttackerStateUpdate (Unit *pVictim, WeaponAttackType attType, bool ex --m_extraAttacks; } } - - // if damage pVictim call AI reaction - //if(pVictim->GetTypeId()==TYPEID_UNIT && ((Creature*)pVictim)->AI()) - // ((Creature*)pVictim)->AI()->AttackedBy(this); } MeleeHitOutcome Unit::RollMeleeOutcomeAgainst(const Unit *pVictim, WeaponAttackType attType) const -- cgit v1.2.3