Merge branch 'master' into min-ver-fix

Fernando-A-Rocha · Fernando-A-Rocha · commit 776b01598a34 · 2024-11-19T14:23:10.000Z
diff --git a/Client/core/CConsole.h b/Client/core/CConsole.h
@@ -41,7 +41,6 @@ class CConsole : public CConsoleInterface
     bool IsInputActive();
     void ActivateInput();
 
-    void HandleTextAccepted(bool bHandled);
     void GetCommandInfo(const std::string& strIn, std::string& strCmdOut, std::string& strCmdLineOut);
 
     void ResetHistoryChanges();
diff --git a/Server/mods/deathmatch/logic/CResource.cpp b/Server/mods/deathmatch/logic/CResource.cpp
@@ -35,6 +35,8 @@
 #include <net/SimHeaders.h>
 #include <zip.h>
 #include <glob/glob.h>
+#include "version.h"
+#include "CStaticFunctionDefinitions.h"
 
 #ifdef WIN32
     #include <zip/iowin32.h>
