josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
--HG--
branch : trunk
This commit is contained in:
Shauren
2010-12-22 20:23:47 +01:00
parent 446c300505
commit 7b4e1c6387
43 changed files with 123 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/Commands/cs_debug.cpp
+1 -1
View File
@@ -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;
src/server/scripts/Commands/cs_gobject.cpp
+4 -4
View File
@@ -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;
src/server/scripts/Commands/cs_npc.cpp
+3 -3
View File
@@ -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)
src/server/scripts/Commands/cs_quest.cpp
+1 -1
View File
@@ -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);
}
src/server/scripts/Spells/spell_warlock.cpp
+1 -1
View File
@@ -66,7 +66,7 @@ public:
{
if (targetCreature->isPet())
{
CreatureInfo const * ci = sObjectMgr.GetCreatureTemplate(targetCreature->GetEntry());
CreatureInfo const * ci = ObjectMgr::GetCreatureTemplate(targetCreature->GetEntry());
switch (ci->family)
{
case CREATURE_FAMILY_SUCCUBUS: