aboutsummaryrefslogtreecommitdiff
path: root/src/trinitycore
diff options
context:
space:
mode:
authorn0n4m3 <none@none>2009-12-24 10:20:15 +0100
committern0n4m3 <none@none>2009-12-24 10:20:15 +0100
commit250a00cc1c91d2df2b6c4f72a2ad322b46fed783 (patch)
treeeab0216df4c91777747e866ed4525c9fbc7a037f /src/trinitycore
parentacdc4ca15b69c84197f867192328829904646a66 (diff)
Temporary revert 6743 commit. I fix this patch across 1-2 days.
--HG-- branch : trunk
Diffstat (limited to 'src/trinitycore')
-rw-r--r--src/trinitycore/Master.cpp2
-rw-r--r--src/trinitycore/WorldRunnable.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/trinitycore/Master.cpp b/src/trinitycore/Master.cpp
index f62168fa9be..ba293ec841a 100644
--- a/src/trinitycore/Master.cpp
+++ b/src/trinitycore/Master.cpp
@@ -39,7 +39,7 @@
#include "Master.h"
#include "RASocket.h"
#include "ScriptCalls.h"
-#include "TimeMgr.h"
+#include "Timer.h"
#include "Util.h"
#include "sockets/TcpSocket.h"
diff --git a/src/trinitycore/WorldRunnable.cpp b/src/trinitycore/WorldRunnable.cpp
index 2125ba435db..67ffe7c474e 100644
--- a/src/trinitycore/WorldRunnable.cpp
+++ b/src/trinitycore/WorldRunnable.cpp
@@ -30,7 +30,7 @@
#include "BattleGroundMgr.h"
#include "MapManager.h"
-#include "TimeMgr.h"
+#include "Timer.h"
#include "WorldRunnable.h"
#define WORLD_SLEEP_CONST 50