From c5f5d72e3f62924ddd8acf3c8cb1c5d58c2c644b Mon Sep 17 00:00:00 2001
From: RocketersAlex <rocketers@yandex.ru>
Date: Thu, 31 Mar 2016 05:43:38 +0300
Subject: [PATCH] Update MSLegacy.h Network.cpp GameAgent.cpp

---
 Sources/Engine/Engine.vcxproj          | 1 +
 Sources/Engine/Engine.vcxproj.filters  | 3 +++
 Sources/Engine/GameAgent/GameAgent.cpp | 6 +++---
 Sources/Engine/GameAgent/MSLegacy.h    | 5 +++--
 Sources/Engine/Network/Network.cpp     | 6 +++---
 5 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/Sources/Engine/Engine.vcxproj b/Sources/Engine/Engine.vcxproj
index 85f3508..b893744 100644
--- a/Sources/Engine/Engine.vcxproj
+++ b/Sources/Engine/Engine.vcxproj
@@ -734,6 +734,7 @@ copy Release\$(TargetName).lib $(SolutionDir)..\Bin\ &gt;nul</Command>
     <ClInclude Include="Base\Updateable.h" />
     <ClInclude Include="Base\UpdateableRT.h" />
     <ClInclude Include="GameAgent\GameAgent.h" />
+    <ClInclude Include="GameAgent\MSLegacy.h" />
     <ClInclude Include="Math\AABBox.h" />
     <ClInclude Include="Math\FixInt.h" />
     <ClInclude Include="Math\Float.h" />
diff --git a/Sources/Engine/Engine.vcxproj.filters b/Sources/Engine/Engine.vcxproj.filters
index a84e7db..870a661 100644
--- a/Sources/Engine/Engine.vcxproj.filters
+++ b/Sources/Engine/Engine.vcxproj.filters
@@ -1365,6 +1365,9 @@
     <ClInclude Include="GameAgent\GameAgent.h">
       <Filter>Header Files\GameAgent Headers</Filter>
     </ClInclude>
+    <ClInclude Include="GameAgent\MSLegacy.h">
+      <Filter>Header Files\GameAgent Headers</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="Base\CTString.inl">
diff --git a/Sources/Engine/GameAgent/GameAgent.cpp b/Sources/Engine/GameAgent/GameAgent.cpp
index b104756..5036f57 100644
--- a/Sources/Engine/GameAgent/GameAgent.cpp
+++ b/Sources/Engine/GameAgent/GameAgent.cpp
@@ -128,11 +128,11 @@ TIME _tmLastHeartbeat = 0;
 CDynamicStackArray<CServerRequest> ga_asrRequests;
 
 //extern CTString ga_strServer = "master1.croteam.org";
-CTString ga_strServer = "master1.42amsterdam.net";
+extern CTString ga_strServer = "master1.42amsterdam.net";
 //extern CTString ga_strMSLegacy = "master1.croteam.org";
-CTString ga_strMSLegacy = "42amsterdam.net";
+extern CTString ga_strMSLegacy = "42amsterdam.net";
 
-BOOL ga_bMSLegacy = TRUE;
+extern BOOL ga_bMSLegacy = TRUE;
 //BOOL ga_bMSLegacy = FALSE;
 
 void _uninitWinsock();
diff --git a/Sources/Engine/GameAgent/MSLegacy.h b/Sources/Engine/GameAgent/MSLegacy.h
index 4defdfb..7691d82 100644
--- a/Sources/Engine/GameAgent/MSLegacy.h
+++ b/Sources/Engine/GameAgent/MSLegacy.h
@@ -73,7 +73,8 @@ LICENSE
 
     http://www.gnu.org/licenses/gpl.txt
 */
-
+#ifndef SE_INCL_MSLEGACY_H
+#define SE_INCL_MSLEGACY_H
 #ifdef PRAGMA_ONCE
   #pragma once
 #endif
@@ -182,4 +183,4 @@ u_int resolv(char *host) {
 
 /* end functions  */
 
-
+#endif // include once check
diff --git a/Sources/Engine/Network/Network.cpp b/Sources/Engine/Network/Network.cpp
index 724960d..94942af 100644
--- a/Sources/Engine/Network/Network.cpp
+++ b/Sources/Engine/Network/Network.cpp
@@ -886,9 +886,9 @@ void CNetworkLibrary::Init(const CTString &strGameID)
 
   _pShell->DeclareSymbol("persistent user INDEX wed_bUseGenericTextureReplacement;", &wed_bUseGenericTextureReplacement);
 
-  _pShell->DeclareSymbol("user CTString ga_strServer;", &ga_strServer);
-  _pShell->DeclareSymbol("user CTString ga_strMSLegacy;", &ga_strMSLegacy);
-  _pShell->DeclareSymbol("user INDEX ga_bMSLegacy;", &ga_bMSLegacy);
+  _pShell->DeclareSymbol("persistent user CTString ga_strServer;", &ga_strServer);
+  _pShell->DeclareSymbol("persistent user CTString ga_strMSLegacy;", &ga_strMSLegacy);
+  _pShell->DeclareSymbol("persistent user INDEX ga_bMSLegacy;", &ga_bMSLegacy);
 
   _pShell->DeclareSymbol("INDEX pwoCurrentWorld;", &_pwoCurrentWorld);
 }