Core/ObjectMgr: Static members are no longer accessed through singleton

--HG--
branch : trunk

4 files changed, 9 insertions, 9 deletions

diff --git a/src/server/scripts/Commands/cs_debug.cpp b/src/server/scripts/Commands/cs_debug.cpp
index bbeaf5bbbc8..cc041f08ced 100644
--- a/src/server/scripts/Commands/cs_debug.cpp
+++ b/src/server/scripts/Commands/cs_debug.cpp
@@ -851,7 +851,7 @@ public:
 
         uint32 id = (uint32)atoi(i);
 
-        CreatureInfo const *ci = sObjectMgr.GetCreatureTemplate(entry);
+        CreatureInfo const *ci = ObjectMgr::GetCreatureTemplate(entry);
 
         if (!ci)
             return false;
diff --git a/src/server/scripts/Commands/cs_gobject.cpp b/src/server/scripts/Commands/cs_gobject.cpp
index b5c5ff0c1a3..866deba41e3 100644
--- a/src/server/scripts/Commands/cs_gobject.cpp
+++ b/src/server/scripts/Commands/cs_gobject.cpp
@@ -121,7 +121,7 @@ public:
 
         char* spawntimeSecs = strtok(NULL, " ");
 
-        const GameObjectInfo *gInfo = sObjectMgr.GetGameObjectInfo(id);
+        const GameObjectInfo *gInfo = ObjectMgr::GetGameObjectInfo(id);
 
         if (!gInfo)
         {
@@ -304,7 +304,7 @@ public:
             return false;
         }
 
-        GameObjectInfo const* goI = sObjectMgr.GetGameObjectInfo(id);
+        GameObjectInfo const* goI = ObjectMgr::GetGameObjectInfo(id);
 
         if (!goI)
         {
@@ -557,7 +557,7 @@ public:
                 float z = fields[4].GetFloat();
                 uint16 mapid = fields[5].GetUInt16();
 
-                GameObjectInfo const * gInfo = sObjectMgr.GetGameObjectInfo(entry);
+                GameObjectInfo const * gInfo = ObjectMgr::GetGameObjectInfo(entry);
 
                 if (!gInfo)
                     continue;
@@ -589,7 +589,7 @@ public:
                 entry = atoi((char*)args);
         }
 
-        GameObjectInfo const* goinfo = sObjectMgr.GetGameObjectInfo(entry);
+        GameObjectInfo const* goinfo = ObjectMgr::GetGameObjectInfo(entry);
 
         if (!goinfo)
             return false;
diff --git a/src/server/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp
index c4f85adce2a..dff80798a99 100644
--- a/src/server/scripts/Commands/cs_npc.cpp
+++ b/src/server/scripts/Commands/cs_npc.cpp
@@ -201,7 +201,7 @@ public:
 
         sObjectMgr.AddVendorItem(vendor_entry,itemId,maxcount,incrtime,extendedcost);
 
-        ItemPrototype const* pProto = sObjectMgr.GetItemPrototype(itemId);
+        ItemPrototype const* pProto = ObjectMgr::GetItemPrototype(itemId);
 
         handler->PSendSysMessage(LANG_ITEM_ADDED_TO_LIST,itemId,pProto->Name1,maxcount,incrtime,extendedcost);
         return true;
@@ -419,7 +419,7 @@ public:
             return false;
         }
 
-        ItemPrototype const* pProto = sObjectMgr.GetItemPrototype(itemId);
+        ItemPrototype const* pProto = ObjectMgr::GetItemPrototype(itemId);
 
         handler->PSendSysMessage(LANG_ITEM_DELETED_FROM_LIST,itemId,pProto->Name1);
         return true;
@@ -1302,7 +1302,7 @@ public:
         uint32 ItemID = atoi(pItemID);
         uint32 SlotID = atoi(pSlotID);
 
-        ItemPrototype* tmpItem = sObjectMgr.GetItemPrototype(ItemID);
+        ItemPrototype* tmpItem = ObjectMgr::GetItemPrototype(ItemID);
 
         bool added = false;
         if (tmpItem)
diff --git a/src/server/scripts/Commands/cs_quest.cpp b/src/server/scripts/Commands/cs_quest.cpp
index 9cff431ef3e..62984862ff9 100644
--- a/src/server/scripts/Commands/cs_quest.cpp
+++ b/src/server/scripts/Commands/cs_quest.cpp
@@ -212,7 +212,7 @@ public:
             }
             else if (creature > 0)
             {
-                if (CreatureInfo const* cInfo = sObjectMgr.GetCreatureTemplate(creature))
+                if (CreatureInfo const* cInfo = ObjectMgr::GetCreatureTemplate(creature))
                     for (uint16 z = 0; z < creaturecount; ++z)
                         player->KilledMonster(cInfo,0);
             }