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/game/Maps/Map.cpp
+1 -1
View File
@@ -2402,7 +2402,7 @@ void InstanceMap::CreateInstanceData(bool load)
if (i_data != NULL)
return;
InstanceTemplate const* mInstance = sObjectMgr.GetInstanceTemplate(GetId());
InstanceTemplate const* mInstance = ObjectMgr::GetInstanceTemplate(GetId());
if (mInstance)
{
i_script_id = mInstance->script_id;
src/server/game/Maps/MapInstanced.cpp
+1 -1
View File
@@ -179,7 +179,7 @@ InstanceMap* MapInstanced::CreateInstance(uint32 InstanceId, InstanceSave *save,
sLog.outError("CreateInstance: no entry for map %d", GetId());
ASSERT(false);
}
const InstanceTemplate * iTemplate = sObjectMgr.GetInstanceTemplate(GetId());
const InstanceTemplate * iTemplate = ObjectMgr::GetInstanceTemplate(GetId());
if (!iTemplate)
{
sLog.outError("CreateInstance: no instance template for map %d", GetId());
src/server/game/Maps/MapManager.cpp
+3 -3
View File
@@ -163,7 +163,7 @@ bool MapManager::CanPlayerEnter(uint32 mapid, Player* player, bool loginCheck)
if (!entry->IsDungeon())
return true;
InstanceTemplate const* instance = sObjectMgr.GetInstanceTemplate(mapid);
InstanceTemplate const* instance = ObjectMgr::GetInstanceTemplate(mapid);
if (!instance)
return false;
@@ -213,7 +213,7 @@ bool MapManager::CanPlayerEnter(uint32 mapid, Player* player, bool loginCheck)
if (instance_map == mapid)
break;
InstanceTemplate const* instance = sObjectMgr.GetInstanceTemplate(instance_map);
InstanceTemplate const* instance = ObjectMgr::GetInstanceTemplate(instance_map);
instance_map = instance ? instance->parent : 0;
}
while (instance_map);
@@ -299,7 +299,7 @@ bool MapManager::ExistMapAndVMap(uint32 mapid, float x,float y)
bool MapManager::IsValidMAP(uint32 mapid)
{
MapEntry const* mEntry = sMapStore.LookupEntry(mapid);
return mEntry && (!mEntry->IsDungeon() || sObjectMgr.GetInstanceTemplate(mapid));
return mEntry && (!mEntry->IsDungeon() || ObjectMgr::GetItemPrototype(mapid));
// TODO: add check for battleground template
}