Changeset 272 for trunk/src/game/Creature.cpp

Timestamp:

11/22/08 00:35:41 (17 years ago)

Author:

yumileroy

Message:

Delete possessed AI only on creature delete.

Original author: gvcoman
Date: 2008-11-16 14:38:02-05:00

Files:

• trunk/src/game/Creature.cpp (modified) (14 diffs)

trunk/src/game/Creature.cpp

@@ -123 +123 @@
 m_lootMoney(0), m_lootRecipient(0),
 m_deathTimer(0), m_respawnTime(0), m_respawnDelay(25), m_corpseDelay(60), m_respawnradius(0.0f),
-m_gossipOptionLoaded(false), m_emoteState(0), m_isPet(false), m_isTotem(false), m_isAggressive(true),
+m_gossipOptionLoaded(false), m_emoteState(0), m_isPet(false), m_isTotem(false),
 m_regenTimer(2000), m_defaultMovementType(IDLE_MOTION_TYPE), m_equipmentId(0),
 m_AlreadyCallAssistence(false), m_regenHealth(true), m_AI_locked(false), m_isDeadByDefault(false),
@@ -148 +148 @@
     i_AI = NULL;
 
-    DeletePossessedAI();
+    if (i_AI_possessed)
+    {
+        delete i_AI_possessed;
+        i_AI_possessed = NULL;
+    }
 }
 
@@ -178 +182 @@
     float x,y,z,o;
     GetRespawnCoord(x, y, z, &o);
-    GetMap()->CreatureRelocation(this,x,y,z,o);
+    MapManager::Instance().GetMap(GetMapId(), this)->CreatureRelocation(this,x,y,z,o);
 }
 
@@ -210 +214 @@
     }
 
-    SetEntry(Entry);                                        // normal entry always
+    SetUInt32Value(OBJECT_FIELD_ENTRY, Entry);              // normal entry always
     m_creatureInfo = cinfo;                                 // map mode related always
 
@@ -294 +298 @@
     SetUInt32Value(UNIT_DYNAMIC_FLAGS,GetCreatureInfo()->dynamicflags);
 
-    SetMeleeDamageSchool(SpellSchools(GetCreatureInfo()->dmgschool));
     SetModifierValue(UNIT_MOD_ARMOR,             BASE_VALUE, float(GetCreatureInfo()->armor));
     SetModifierValue(UNIT_MOD_RESISTANCE_HOLY,   BASE_VALUE, float(GetCreatureInfo()->resistance1));
@@ -325 +328 @@
         SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
 
-    if(isTotem() || isCivilian() || GetCreatureInfo()->flags_extra & CREATURE_FLAG_EXTRA_TRIGGER
-        || GetCreatureType() == CREATURE_TYPE_CRITTER)
-        m_isAggressive = false;
-    else
-        m_isAggressive = true;
-
     return true;
 }
@@ -360 +357 @@
                 lootForBody         = false;
 
-                if(m_originalEntry != GetEntry())
+                if(m_originalEntry != GetUInt32Value(OBJECT_FIELD_ENTRY))
                     UpdateEntry(m_originalEntry);
 
@@ -379 +376 @@
 
                 //Call AI respawn virtual function
-                i_AI->JustRespawned();
-
-                GetMap()->Add(this);
+                AI()->JustRespawned();
+
+                MapManager::Instance().GetMap(GetMapId(), this)->Add(this);
             }
             break;
@@ -443 +440 @@
                 // do not allow the AI to be changed during update
                 m_AI_locked = true;
-                i_AI->UpdateAI(diff);
+                AI()->UpdateAI(diff);
                 m_AI_locked = false;
             }
@@ -563 +560 @@
 }
 
-void Creature::DeletePossessedAI()
+void Creature::DisablePossessedAI()
 {
     if (!i_AI_possessed) return;
-
-    delete i_AI_possessed;
-    i_AI_possessed = NULL;
 
     // Signal the old AI that it's been re-enabled
@@ -1418 +1412 @@
     SetPower(POWER_MANA,data->curmana);
 
+    SetMeleeDamageSchool(SpellSchools(GetCreatureInfo()->dmgschool));
+
     // checked at creature_template loading
     m_defaultMovementType = MovementGeneratorType(data->movementType);
@@ -1542 +1538 @@
 {
     return IsWithinDistInMap(u, sWorld.getConfig(CONFIG_SIGHT_MONSTER));
-}
-
-bool Creature::canStartAttack(Unit const* who) const
-{
-    if(!who->isInAccessiblePlaceFor(this)
-        || !canFly() && GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE
-        || !IsWithinDistInMap(who, GetAttackDistance(who)))
-        return false;
-
-    if(!canAttack(who))
-        return false;
-
-    return IsWithinLOSInMap(who);
 }
 
@@ -1836 +1819 @@
 }
 
-Unit* Creature::SelectNearestTarget(float dist) const
-{
-    CellPair p(Trinity::ComputeCellPair(GetPositionX(), GetPositionY()));
-    Cell cell(p);
-    cell.data.Part.reserved = ALL_DISTRICT;
-    cell.SetNoCreate();
-
-    Unit *target = NULL;
-
-    {
-        Trinity::NearestHostileUnitInAttackDistanceCheck u_check(this, dist);
-        Trinity::UnitLastSearcher<Trinity::NearestHostileUnitInAttackDistanceCheck> searcher(target, u_check);
-
-        TypeContainerVisitor<Trinity::UnitLastSearcher<Trinity::NearestHostileUnitInAttackDistanceCheck>, WorldTypeMapContainer > world_unit_searcher(searcher);
-        TypeContainerVisitor<Trinity::UnitLastSearcher<Trinity::NearestHostileUnitInAttackDistanceCheck>, GridTypeMapContainer >  grid_unit_searcher(searcher);
-
-        CellLock<GridReadGuard> cell_lock(cell, p);
-        cell_lock->Visit(cell_lock, world_unit_searcher, *GetMap());
-        cell_lock->Visit(cell_lock, grid_unit_searcher, *GetMap());
-    }
-
-    return target;
-}
-
 void Creature::CallAssistence()
 {
@@ -2139 +2098 @@
 }
 
-std::string Creature::GetScriptName()
-{
-    return objmgr.GetScriptName(GetScriptId());
-}
-
-uint32 Creature::GetScriptId()
-{
-    return ObjectMgr::GetCreatureTemplate(GetEntry())->ScriptID;
+char const* Creature::GetScriptName() const
+{
+    return ObjectMgr::GetCreatureTemplate(GetEntry())->ScriptName;
 }