From 1e997b95cc89c615adf2acd27a5f6916b78e0ff3 Mon Sep 17 00:00:00 2001
From: megamage <none@none>
Date: Thu, 20 Nov 2008 16:16:57 -0600
Subject: Re-commit 262 due to EOL issues. (no difference from 262)

--HG--
branch : trunk
---
 src/game/Creature.cpp | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

(limited to 'src/game/Creature.cpp')

diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp
index 5e3d3ac9f8e..8a58deb7f91 100644
--- a/src/game/Creature.cpp
+++ b/src/game/Creature.cpp
@@ -177,7 +177,7 @@ void Creature::RemoveCorpse()
 
     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);
 }
 
 /**
@@ -209,7 +209,7 @@ bool Creature::InitEntry(uint32 Entry, uint32 team, const CreatureData *data )
         }
     }
 
-    SetUInt32Value(OBJECT_FIELD_ENTRY, Entry);              // normal entry always
+    SetEntry(Entry);                                        // normal entry always
     m_creatureInfo = cinfo;                                 // map mode related always
 
     // Cancel load if no model defined
@@ -352,7 +352,7 @@ void Creature::Update(uint32 diff)
                 lootForPickPocketed = false;
                 lootForBody         = false;
 
-                if(m_originalEntry != GetUInt32Value(OBJECT_FIELD_ENTRY))
+                if(m_originalEntry != GetEntry())
                     UpdateEntry(m_originalEntry);
 
                 CreatureInfo const *cinfo = GetCreatureInfo();
@@ -371,9 +371,9 @@ void Creature::Update(uint32 diff)
                     setDeathState( JUST_ALIVED );
 
                 //Call AI respawn virtual function
-                AI()->JustRespawned();
+                i_AI->JustRespawned();
 
-                MapManager::Instance().GetMap(GetMapId(), this)->Add(this);
+                GetMap()->Add(this);
             }
             break;
         }
@@ -435,7 +435,7 @@ void Creature::Update(uint32 diff)
             {
                 // 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;
             }
 
@@ -2096,9 +2096,14 @@ uint32 Creature::getLevelForTarget( Unit const* target ) const
     return level;
 }
 
-char const* Creature::GetScriptName() const
+std::string Creature::GetScriptName()
 {
-    return ObjectMgr::GetCreatureTemplate(GetEntry())->ScriptName;
+    return objmgr.GetScriptName(GetScriptId());
+}
+
+uint32 Creature::GetScriptId()
+{
+    return ObjectMgr::GetCreatureTemplate(GetEntry())->ScriptID;
 }
 
 VendorItemData const* Creature::GetVendorItems() const
-- 
cgit v1.2.3