aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2011-03-26 09:19:54 +0100
committerShauren <shauren.trinity@gmail.com>2011-03-26 09:19:54 +0100
commit18995661a79837953e5345090645c5506f9d46bf (patch)
tree2495be7019ff8af476208ed1256d201d03f64922 /src
parent00f343af52768802775acfd533db993786042beb (diff)
Core/Scripts: Reverted part of 00f343af52768802775a, that is not a typo and fixed the hook properly
Diffstat (limited to 'src')
-rwxr-xr-xsrc/server/game/Scripting/ScriptMgr.cpp2
-rwxr-xr-xsrc/server/game/Scripting/ScriptMgr.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp
index 8434289ce96..ff127a45889 100755
--- a/src/server/game/Scripting/ScriptMgr.cpp
+++ b/src/server/game/Scripting/ScriptMgr.cpp
@@ -422,7 +422,7 @@ void ScriptMgr::OnShutdownCancel()
void ScriptMgr::OnWorldUpdate(uint32 diff)
{
- FOREACH_SCRIPT(WorldScript)->OnUpdate(NULL, diff);
+ FOREACH_SCRIPT(WorldScript)->OnUpdate(diff);
}
void ScriptMgr::OnHonorCalculation(float& honor, uint8 level, float multiplier)
diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h
index b1df41847d6..85c8dfbc866 100755
--- a/src/server/game/Scripting/ScriptMgr.h
+++ b/src/server/game/Scripting/ScriptMgr.h
@@ -261,7 +261,7 @@ class WorldScript : public ScriptObject, public UpdatableScript<void>
virtual void OnShutdownCancel() { }
// Called on every world tick (don't execute too heavy code here).
- virtual void OnWorldUpdate(uint32 /*diff*/) { }
+ virtual void OnUpdate(uint32 /*diff*/) { }
// Called when the world is started.
virtual void OnStartup() { }