Add exit code to shutdown function (Fixes #2293) (PR #2298)

Author: botder

Server/core/CModManagerImpl.cpp

@@ -127,7 +127,7 @@ void CModManagerImpl::Unload(bool bKeyPressBeforeTerm)
                 Print("Press Q to shut down the server!\n");
                 WaitForKey('q');
             }
-            TerminateProcess(GetCurrentProcess(), 0);
+            TerminateProcess(GetCurrentProcess(), GetExitCode());
         }
 #endif
         // Unload the library
@@ -179,6 +179,16 @@ bool CModManagerImpl::GetSleepIntervals(int& iSleepBusyMs, int& iSleepIdleMs, in
     return false;
 }
 
+void CModManagerImpl::SetExitCode(int exitCode)
+{
+    m_pServer->SetExitCode(exitCode);
+}
+
+int CModManagerImpl::GetExitCode() const
+{
+    return m_pServer->GetExitCode();
+}
+
 void CModManagerImpl::GetTag(char* szInfoTag, int iInfoTag)
 {
     if (m_pBase)

Server/core/CModManagerImpl.h

@@ -52,6 +52,9 @@ class CModManagerImpl : public CModManager
     bool             GetSleepIntervals(int& iSleepBusyMs, int& iSleepIdleMs, int& iLogicFpsLimit);
     CDynamicLibrary& GetDynamicLibrary() { return m_Library; };
 
+    void SetExitCode(int exitCode) override;
+    int  GetExitCode() const override;
+
 private:
     CServerImpl* m_pServer;
 

Server/core/CServerImpl.cpp

@@ -64,6 +64,7 @@ CServerImpl::CServerImpl()
     m_pNetwork = NULL;
     m_bRequestedQuit = false;
     m_bRequestedReset = false;
+    m_exitCode = ERROR_NO_ERROR;
     memset(&m_szInputBuffer, 0, sizeof(m_szInputBuffer));
     memset(&m_szTag, 0, sizeof(m_szTag) * sizeof(char));
     m_uiInputCount = 0;

Server/core/CServerImpl.h

@@ -67,6 +67,9 @@ class CServerImpl : public CServerInterface
     bool HasConsole();
 #endif
 
+    void SetExitCode(int exitCode) { m_exitCode = exitCode; }
+    int  GetExitCode() const { return m_exitCode; }
+
 private:
     void MainLoop();
 
@@ -104,6 +107,8 @@ class CServerImpl : public CServerInterface
     double m_dLastTimeMs;
     double m_dPrevOverrun;
 
+    int m_exitCode;
+
     std::vector<std::vector<SString>> m_vecCommandHistory = {{"", ""}};
     uint                              m_uiSelectedCommandHistoryEntry = 0;
 

Server/core/Server.cpp

@@ -13,6 +13,7 @@
 #include "CServerImpl.h"
 #define ALLOC_STATS_MODULE_NAME "core"
 #include "SharedUtil.hpp"
+#include "ErrorCodes.h"
 #ifdef WIN_x86
 // TODO - 64 bit file hooks
     #include "SharedUtil.Win32Utf8FileHooks.hpp"
@@ -66,6 +67,10 @@ MTAEXPORT int Run(int iArgumentCount, char* szArguments[])
     RemoveUtf8FileHooks();
     #endif
 
+    // Overwrite the exit code, if we are stopping gracefully without errors
+    if (iReturn == ERROR_NO_ERROR)
+        iReturn = Server.GetExitCode();
+
     return iReturn;
 }
 

Server/mods/deathmatch/StdInc.h

@@ -157,7 +157,6 @@ struct SAclRequest;
 #include "lua/CLuaManager.h"
 #include "lua/CLuaTimerManager.h"
 #include "lua/CLuaTimer.h"
-#include "lua/CLuaFunctionDefs.h"
 #include "lua/CLuaModuleManager.h"
 #include "lua/CLuaArgument.h"
 #include "lua/CLuaCFunctions.h"

Server/mods/deathmatch/logic/CGame.cpp

@@ -800,7 +800,6 @@ bool CGame::Start(int iArgumentCount, char* szArguments[])
     m_pZoneNames = new CZoneNames;
 
     CStaticFunctionDefinitions(this);
-    CLuaFunctionDefs::Initialize(m_pLuaManager, this);
     CLuaDefs::Initialize(this);
 
     m_pPlayerManager->SetScriptDebugging(m_pScriptDebugging);

Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp

@@ -11,7 +11,8 @@
 
 #include "StdInc.h"
 
-extern CGame* g_pGame;
+extern CGame*            g_pGame;
+extern CTimeUsMarker<20> markerLatentEvent;
 
 static CLuaManager*          m_pLuaManager;
 static CColManager*          m_pColManager;

Server/mods/deathmatch/logic/lua/CLuaFunctionDefs.cpp

@@ -10,8 +10,7 @@
  *****************************************************************************/
 
 #include "StdInc.h"
-
-#include "CLuaFunctionDefs.h"
+#include "luadefs/CLuaFunctionDefs.h"
 #include <clocale>
 
 static CLuaManager* m_pLuaManager;