Changeset 140 for trunk/src/game/Unit.cpp

Timestamp:

11/19/08 13:39:45 (17 years ago)

Author:

yumileroy

Message:

[svn] Set target in combat even if spell does not hit target.
Call AI function only when spell hits target.
Move combat check from dealdamge to attackerstateupdate to remove redundant check.

Original author: megamage
Date: 2008-10-31 14:00:49-05:00

Files:

• trunk/src/game/Unit.cpp (modified) (3 diffs)

trunk/src/game/Unit.cpp

@@ -520 +520 @@
             return damage;
         }
-
-        if(!pVictim->isInCombat() && ((Creature*)pVictim)->AI())
-            ((Creature*)pVictim)->AI()->AttackStart(this);
     }
 
@@ -539 +536 @@
 
         duel_hasEnded = true;
-    }
-    //Get in CombatState
-    if(pVictim != this && damagetype != DOT)
-    {
-        SetInCombatWith(pVictim);
-        pVictim->SetInCombatWith(this);
-
-        if(Player* attackedPlayer = pVictim->GetCharmerOrOwnerPlayerOrPlayerItself())
-            SetContestedPvP(attackedPlayer);
     }
 
@@ -2151 +2139 @@
     if(IsNonMeleeSpellCasted(false))
         return;
+
+    if(!pVictim->isInCombat() && pVictim->GetTypeId() != TYPEID_PLAYER && ((Creature*)pVictim)->AI())
+        ((Creature*)pVictim)->AI()->AttackStart(this);
+
+    SetInCombatWith(pVictim);
+    pVictim->SetInCombatWith(this);
+
+    if(Player* attackedPlayer = pVictim->GetCharmerOrOwnerPlayerOrPlayerItself())
+        SetContestedPvP(attackedPlayer);
 
     uint32 hitInfo;