Skip to content

Commit

Permalink
Core/Worldserver: Move the Realm instance into the game library
Browse files Browse the repository at this point in the history
(cherry picked from commit 7c257aa)
  • Loading branch information
Naios committed Mar 11, 2016
1 parent b7f9368 commit cebe612
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 2 deletions.
1 change: 1 addition & 0 deletions src/server/game/World/World.cpp
Expand Up @@ -3295,3 +3295,4 @@ void World::RemoveOldCorpses()
m_timers[WUPDATE_CORPSES].SetCurrent(m_timers[WUPDATE_CORPSES].GetInterval());
}

Realm realm;
1 change: 1 addition & 0 deletions src/server/game/World/World.h
Expand Up @@ -870,5 +870,6 @@ class World
extern Realm realm;

#define sWorld World::instance()

#endif
/// @}
2 changes: 0 additions & 2 deletions src/server/worldserver/Main.cpp
Expand Up @@ -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);
Expand Down

0 comments on commit cebe612

Please sign in to comment.