diff options
author | n0n4m3 <none@none> | 2009-12-24 10:20:15 +0100 |
---|---|---|
committer | n0n4m3 <none@none> | 2009-12-24 10:20:15 +0100 |
commit | 250a00cc1c91d2df2b6c4f72a2ad322b46fed783 (patch) | |
tree | eab0216df4c91777747e866ed4525c9fbc7a037f /src/game/Map.cpp | |
parent | acdc4ca15b69c84197f867192328829904646a66 (diff) |
Temporary revert 6743 commit. I fix this patch across 1-2 days.
--HG--
branch : trunk
Diffstat (limited to 'src/game/Map.cpp')
-rw-r--r-- | src/game/Map.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/game/Map.cpp b/src/game/Map.cpp index f419e21364a..8e72be7ad5e 100644 --- a/src/game/Map.cpp +++ b/src/game/Map.cpp @@ -3135,7 +3135,7 @@ void Map::ScriptsStart(ScriptMapMap const& scripts, uint32 id, Object* source, O sa.ownerGUID = ownerGUID; sa.script = &iter->second; - m_scriptSchedule.insert(std::pair<time_t, ScriptAction>(time_t(sGameTime.GetGameTime() + iter->first), sa)); + m_scriptSchedule.insert(std::pair<time_t, ScriptAction>(time_t(sWorld.GetGameTime() + iter->first), sa)); if (iter->first == 0) immedScript = true; @@ -3165,7 +3165,7 @@ void Map::ScriptCommandStart(ScriptInfo const& script, uint32 delay, Object* sou sa.ownerGUID = ownerGUID; sa.script = &script; - m_scriptSchedule.insert(std::pair<time_t, ScriptAction>(time_t(sGameTime.GetGameTime() + delay), sa)); + m_scriptSchedule.insert(std::pair<time_t, ScriptAction>(time_t(sWorld.GetGameTime() + delay), sa)); sWorld.IncreaseScheduledScriptsCount(); @@ -3187,7 +3187,7 @@ void Map::ScriptsProcess() ///- Process overdue queued scripts std::multimap<time_t, ScriptAction>::iterator iter = m_scriptSchedule.begin(); // ok as multimap is a *sorted* associative container - while (!m_scriptSchedule.empty() && (iter->first <= sGameTime.GetGameTime())) + while (!m_scriptSchedule.empty() && (iter->first <= sWorld.GetGameTime())) { ScriptAction const& step = iter->second; |