Changeset 60 for trunk

Timestamp:

11/19/08 13:30:20 (17 years ago)

Author:

yumileroy

Message:

[svn] * Prevent creatures from moving if they are dead (if they were fleeing for example).
* Critters now flee from attacker when taking damage.

Original author: Seline
Date: 2008-10-19 10:20:53-05:00

Files:

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

trunk/src/game/Unit.cpp

@@ -501 +501 @@
         if ( pVictim->GetCreatureType() == CREATURE_TYPE_CRITTER)
         {
-            pVictim->setDeathState(JUST_DIED);
-            pVictim->SetHealth(0);
+            // critters run away when hit
+            pVictim->GetMotionMaster()->MoveFleeing(this);
 
             // allow loot only if has loot_id in creature_template
-            CreatureInfo const* cInfo = ((Creature*)pVictim)->GetCreatureInfo();
-            if(cInfo && cInfo->lootid)
-                pVictim->SetUInt32Value(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE);
-
-            // some critters required for quests
-            if(GetTypeId() == TYPEID_PLAYER)
-                ((Player*)this)->KilledMonster(pVictim->GetEntry(),pVictim->GetGUID());
+            if(damage >= pVictim->GetHealth())
+            {
+                pVictim->setDeathState(JUST_DIED);
+                pVictim->SetHealth(0);
+
+                CreatureInfo const* cInfo = ((Creature*)pVictim)->GetCreatureInfo();
+                if(cInfo && cInfo->lootid)
+                    pVictim->SetUInt32Value(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE);
+
+                // some critters required for quests
+                if(GetTypeId() == TYPEID_PLAYER)
+                    ((Player*)this)->KilledMonster(pVictim->GetEntry(),pVictim->GetGUID());
+            }
+            else
+                pVictim->ModifyHealth(- (int32)damage);
 
             return damage;
@@ -612 +620 @@
         pVictim->CombatStop();
         pVictim->getHostilRefManager().deleteReferences();
+
+        // stop movement
+        pVictim->StopMoving();
 
         bool damageFromSpiritOfRedemtionTalent = spellProto && spellProto->Id == 27795;