Improve graceful server shutdown

Author: botder

Server/core/CModManagerImpl.cpp

@@ -130,7 +130,6 @@ void CModManagerImpl::Unload(bool bKeyPressBeforeTerm)
                 Print("Press Q to shut down the server!\n");
                 WaitForKey('q');
             }
-            TerminateProcess(GetCurrentProcess(), GetExitCode());
         }
 #endif
         // Unload the library

Server/core/CServerImpl.cpp

@@ -351,21 +351,26 @@ int CServerImpl::Run(int iArgumentCount, char* szArguments[])
 
         if (m_XMLLibrary.Load(PathJoin(m_strServerPath, SERVER_BIN_PATH, szXMLLibName)))
         {
-            // Grab the network interface
-            InitNetServerInterface pfnInitNetServerInterface = (InitNetServerInterface)(m_NetworkLibrary.GetProcedureAddress("InitNetServerInterface"));
-            InitXMLInterface       pfnInitXMLInterface = (InitXMLInterface)(m_XMLLibrary.GetProcedureAddress("InitXMLInterface"));
+            auto pfnInitNetServerInterface = (InitNetServerInterface)(m_NetworkLibrary.GetProcedureAddress("InitNetServerInterface"));
+            auto pfnReleaseNetServerInterface = (ReleaseNetServerInterface)(m_NetworkLibrary.GetProcedureAddress("ReleaseNetServerInterface"));
+            auto pfnInitXMLInterface = (InitXMLInterface)(m_XMLLibrary.GetProcedureAddress("InitXMLInterface"));
+
             if (pfnInitNetServerInterface && pfnInitXMLInterface)
             {
                 // Call it to grab the network interface class
                 m_pNetwork = pfnInitNetServerInterface();
                 m_pXML = pfnInitXMLInterface(*m_strServerModPath);
+
                 if (m_pNetwork && m_pXML)
                 {
                     // Make the modmanager load our mod
                     if (m_pModManager->Load("deathmatch", iArgumentCount, szArguments))            // Hardcoded for now
                     {
                         // Enter our mainloop
                         MainLoop();
+
+                        if (pfnReleaseNetServerInterface)
+                            pfnReleaseNetServerInterface();
                     }
                     else
                     {

Server/core/CServerImpl.h

@@ -28,6 +28,7 @@ class CServerImpl;
 
 typedef CXML* (*InitXMLInterface)(const char* szSaveFlagDirectory);
 typedef CNetServer* (*InitNetServerInterface)();
+typedef void (*ReleaseNetServerInterface)();
 
 #ifdef WIN32
 constexpr SHORT SCREEN_BUFFER_SIZE = 256;