Merge branch 'master' into 4.3.4
Conflicts: src/server/game/Entities/Player/Player.cpp src/server/scripts/Kalimdor/zone_feralas.cpp
This commit is contained in:
commit
5193eaac87
25 files changed
+1991
-32
No files matched your search
@@ -155,7 +155,7 @@ endif()
|
||||
|
||||
add_dependencies(worldserver revision.h)
|
||||
|
||||
if( UNIX AND NOT NOJEM )
|
||||
if( UNIX AND NOT NOJEM AND NOT APPLE )
|
||||
set(worldserver_LINK_FLAGS "-pthread -lncurses ${worldserver_LINK_FLAGS}")
|
||||
endif()
|
||||
|
||||
|
||||
@@ -158,6 +158,9 @@ extern int main(int argc, char** argv)
|
||||
|
||||
// Set signal handlers (this must be done before starting io_service threads, because otherwise they would unblock and exit)
|
||||
boost::asio::signal_set signals(_ioService, SIGINT, SIGTERM);
|
||||
#if PLATFORM == PLATFORM_WINDOWS
|
||||
signals.add(SIGBREAK);
|
||||
#endif
|
||||
signals.async_wait(SignalHandler);
|
||||
|
||||
// Start the Boost based thread pool
|
||||
@@ -367,18 +370,10 @@ void WorldUpdateLoop()
|
||||
}
|
||||
}
|
||||
|
||||
void SignalHandler(const boost::system::error_code& error, int signalNumber)
|
||||
void SignalHandler(const boost::system::error_code& error, int /*signalNumber*/)
|
||||
{
|
||||
if (!error)
|
||||
{
|
||||
switch (signalNumber)
|
||||
{
|
||||
case SIGINT:
|
||||
case SIGTERM:
|
||||
World::StopNow(SHUTDOWN_EXIT_CODE);
|
||||
break;
|
||||
}
|
||||
}
|
||||
World::StopNow(SHUTDOWN_EXIT_CODE);
|
||||
}
|
||||
|
||||
void FreezeDetectorHandler(const boost::system::error_code& error)
|
||||
@@ -540,6 +535,9 @@ void ClearOnlineAccounts()
|
||||
|
||||
variables_map GetConsoleArguments(int argc, char** argv, std::string& configFile, std::string& configService)
|
||||
{
|
||||
// Silences warning about configService not be used if the OS is not Windows
|
||||
(void)configService;
|
||||
|
||||
options_description all("Allowed options");
|
||||
all.add_options()
|
||||
("help,h", "print usage message")
|
||||
|
||||
Reference in new issue
Block a user