Core/Worldserver: Move the Realm instance into the game library

TrinityCore · Mar 11, 2016 · 7c257aa · 7c257aa
1 parent 329225b
commit 7c257aa
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp
@@ -3473,6 +3473,8 @@ void World::RemoveOldCorpses()
     m_timers[WUPDATE_CORPSES].SetCurrent(m_timers[WUPDATE_CORPSES].GetInterval());
 }
 
+Realm realm;
+
 uint32 GetVirtualRealmAddress()
 {
     return uint32(realm.Id.Region) << 24 | uint32(realm.Id.Site) << 16 | realm.Id.Realm;

diff --git a/src/server/game/World/World.h b/src/server/game/World/World.h
@@ -898,5 +898,6 @@ extern Realm realm;
 uint32 GetVirtualRealmAddress();
 
 #define sWorld World::instance()
+
 #endif
 /// @}
diff --git a/src/server/worldserver/Main.cpp b/src/server/worldserver/Main.cpp
@@ -80,8 +80,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);