aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNaios <naios-dev@live.de>2016-03-11 19:44:10 +0100
committerNaios <naios-dev@live.de>2016-03-11 20:03:13 +0100
commitcebe6122ad3305243e56e17f18b8c374db789862 (patch)
tree1e50b344a4f1ed97c816245edbb8c8533f67c26b
parentb7f936891aeb86eeb4eb67caa78e672858aa1e20 (diff)
Core/Worldserver: Move the Realm instance into the game library
(cherry picked from commit 7c257aab5e941bac508e9c98b837fe06d789f686)
-rw-r--r--src/server/game/World/World.cpp1
-rw-r--r--src/server/game/World/World.h1
-rw-r--r--src/server/worldserver/Main.cpp2
3 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp
index 8496dc08e6e..5652f8c7ebb 100644
--- a/src/server/game/World/World.cpp
+++ b/src/server/game/World/World.cpp
@@ -3295,3 +3295,4 @@ void World::RemoveOldCorpses()
m_timers[WUPDATE_CORPSES].SetCurrent(m_timers[WUPDATE_CORPSES].GetInterval());
}
+Realm realm;
diff --git a/src/server/game/World/World.h b/src/server/game/World/World.h
index 4f53bfd4592..5c18f8db6c3 100644
--- a/src/server/game/World/World.h
+++ b/src/server/game/World/World.h
@@ -870,5 +870,6 @@ class World
extern Realm realm;
#define sWorld World::instance()
+
#endif
/// @}
diff --git a/src/server/worldserver/Main.cpp b/src/server/worldserver/Main.cpp
index 2cb66b4dc2b..fe6baf2fccb 100644
--- a/src/server/worldserver/Main.cpp
+++ b/src/server/worldserver/Main.cpp
@@ -78,8 +78,6 @@ uint32 _worldLoopCounter(0);
uint32 _lastChangeMsTime(0);
uint32 _maxCoreStuckTimeInMs(0);
-Realm realm;
-
void SignalHandler(const boost::system::error_code& error, int signalNumber);
void FreezeDetectorHandler(const boost::system::error_code& error);
AsyncAcceptor* StartRaSocketAcceptor(boost::asio::io_service& ioService);