From 0f3b9019a88777bef8383e699d27a7e8615f93f2 Mon Sep 17 00:00:00 2001 From: Shauren Date: Wed, 22 Dec 2010 21:25:23 +0100 Subject: Core: Get rid of dirty operator workaround for ACE_Singleton class implementation --HG-- branch : trunk --- src/server/game/Scripting/MapScripts.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/server/game/Scripting/MapScripts.cpp') diff --git a/src/server/game/Scripting/MapScripts.cpp b/src/server/game/Scripting/MapScripts.cpp index 88eb795c554..758275eeddc 100755 --- a/src/server/game/Scripting/MapScripts.cpp +++ b/src/server/game/Scripting/MapScripts.cpp @@ -325,7 +325,7 @@ void Map::ScriptsProcess() source = HashMapHolder::Find(step.sourceGUID); break; case HIGHGUID_MO_TRANSPORT: - for (MapManager::TransportSet::iterator iter = sMapMgr.m_Transports.begin(); iter != sMapMgr.m_Transports.end(); ++iter) + for (MapManager::TransportSet::iterator iter = sMapMgr->m_Transports.begin(); iter != sMapMgr->m_Transports.end(); ++iter) { if ((*iter)->GetGUID() == step.sourceGUID) { @@ -390,7 +390,7 @@ void Map::ScriptsProcess() { uint64 targetGUID = target ? target->GetGUID() : 0; LocaleConstant loc_idx = pSource->GetSession()->GetSessionDbLocaleIndex(); - std::string text(sObjectMgr.GetTrinityString(step.script->Talk.TextID, loc_idx)); + std::string text(sObjectMgr->GetTrinityString(step.script->Talk.TextID, loc_idx)); switch (step.script->Talk.ChatType) { @@ -845,7 +845,7 @@ void Map::ScriptsProcess() } else //check hashmap holders { - if (CreatureData const* data = sObjectMgr.GetCreatureData(step.script->CallScript.CreatureEntry)) + if (CreatureData const* data = sObjectMgr->GetCreatureData(step.script->CallScript.CreatureEntry)) cTarget = ObjectAccessor::GetObjectInWorld(data->mapid, data->posX, data->posY, MAKE_NEW_GUID(step.script->CallScript.CreatureEntry, data->id, HIGHGUID_UNIT), cTarget); } -- cgit v1.2.3