aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Scripting/MapScripts.cpp
diff options
context:
space:
mode:
authorShauren <none@none>2010-12-22 21:25:23 +0100
committerShauren <none@none>2010-12-22 21:25:23 +0100
commit0f3b9019a88777bef8383e699d27a7e8615f93f2 (patch)
treeb88e120ad46050aa073ee451676801aabbd3eaa1 /src/server/game/Scripting/MapScripts.cpp
parent0948fc5bbed08ae6edee4fa1ff86df5cfbffa996 (diff)
Core: Get rid of dirty operator workaround for ACE_Singleton class implementation
--HG-- branch : trunk
Diffstat (limited to 'src/server/game/Scripting/MapScripts.cpp')
-rwxr-xr-xsrc/server/game/Scripting/MapScripts.cpp6
1 files changed, 3 insertions, 3 deletions
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<Corpse>::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<Creature>(data->mapid, data->posX, data->posY, MAKE_NEW_GUID(step.script->CallScript.CreatureEntry, data->id, HIGHGUID_UNIT), cTarget);
}