Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2025-04-26 16:46:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into websockets

Browse Source
This commit is contained in:
Aaron Kimbre 2025-02-20 14:46:14 -06:00
commit 9cb9f0bf0f
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dMasterServer/MasterServer.cpp
View File

@ -43,6 +43,13 @@
#include "CDZoneTableTable.h" #include "CDZoneTableTable.h"
#include "eGameMasterLevel.h" #include "eGameMasterLevel.h"
#ifdef DARKFLAME_PLATFORM_UNIX
#include <sys/types.h>
#include <sys/wait.h>
#endif
namespace Game { namespace Game {
Logger* logger = nullptr; Logger* logger = nullptr;
dServer* server = nullptr; dServer* server = nullptr;
@ -455,6 +462,12 @@ int main(int argc, char** argv) {
} }
} }
#ifdef DARKFLAME_PLATFORM_UNIX
// kill off dead zombie instances
int status{};
waitpid(static_cast<pid_t>(-1), &status, WNOHANG);
#endif
t += std::chrono::milliseconds(masterFrameDelta); t += std::chrono::milliseconds(masterFrameDelta);
std::this_thread::sleep_until(t); std::this_thread::sleep_until(t);
} }

3
resources/chatconfig.ini
View File

@ -9,5 +9,6 @@ max_number_of_friends=50
web_server_enabled=0 web_server_enabled=0
web_server_listen_ip=127.0.0.1 # Unused for now
# web_server_listen_ip=127.0.0.1
web_server_listen_port=2005 web_server_listen_port=2005