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

Timestamp:

11/21/08 08:47:55 (17 years ago)

Author:

yumileroy

Message:

*DB script table stucture change. Source Mangos. Also fix some bugs. Hopefully this rev will make program usable again.

Original author: megamage
Date: 2008-11-20 10:43:20-06:00

Files:

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

trunk/src/game/Creature.cpp

@@ -178 +178 @@
     float x,y,z,o;
     GetRespawnCoord(x, y, z, &o);
-    MapManager::Instance().GetMap(GetMapId(), this)->CreatureRelocation(this,x,y,z,o);
+    GetMap()->CreatureRelocation(this,x,y,z,o);
 }
 
@@ -210 +210 @@
     }
 
-    SetUInt32Value(OBJECT_FIELD_ENTRY, Entry);              // normal entry always
+    SetEntry(Entry);                                        // normal entry always
     m_creatureInfo = cinfo;                                 // map mode related always
 
@@ -353 +353 @@
                 lootForBody         = false;
 
-                if(m_originalEntry != GetUInt32Value(OBJECT_FIELD_ENTRY))
+                if(m_originalEntry != GetEntry())
                     UpdateEntry(m_originalEntry);
 
@@ -372 +372 @@
 
                 //Call AI respawn virtual function
-                AI()->JustRespawned();
-
-                MapManager::Instance().GetMap(GetMapId(), this)->Add(this);
+                i_AI->JustRespawned();
+
+                GetMap()->Add(this);
             }
             break;
@@ -436 +436 @@
                 // do not allow the AI to be changed during update
                 m_AI_locked = true;
-                AI()->UpdateAI(diff);
+                i_AI->UpdateAI(diff);
                 m_AI_locked = false;
             }
@@ -2097 +2097 @@
 }
 
-char const* Creature::GetScriptName() const
-{
-    return ObjectMgr::GetCreatureTemplate(GetEntry())->ScriptName;
+std::string Creature::GetScriptName()
+{
+    return objmgr.GetScriptName(GetScriptId());
+}
+
+uint32 Creature::GetScriptId()
+{
+    return ObjectMgr::GetCreatureTemplate(GetEntry())->ScriptID;
 }