Remove GameSpy code from xrGameSpy, link GameSpy library. Close #46.

OpenXRay · Jan 29, 2016 · f4df0c9 · f4df0c9
1 parent 00da9e6
commit f4df0c9
Show file tree

Hide file tree

Showing 1,151 changed files with 38 additions and 331,611 deletions.
diff --git a/src/Common.props b/src/Common.props
@@ -38,7 +38,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir);$(ProjectDir);$(xrSdkDir)include;$(DXSDK_DIR)Include;$(SolutionDir)Externals\luajit\src;$(SolutionDir)Externals\luabind;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir);$(ProjectDir);$(xrSdkDir)include;$(DXSDK_DIR)Include;$(SolutionDir)Externals\luajit\src;$(SolutionDir)Externals\luabind;$(SolutionDir)Externals\GameSpy\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <!--
         4251 : class 'x' needs to have dll-interface to be used by clients of class 'y'

diff --git a/src/xrEngine/main.cpp b/src/xrEngine/main.cpp
@@ -51,7 +51,7 @@ static int start_year = 1999; // 1999
 
 #ifndef DEDICATED_SERVER
 
-#include "xrGameSpy/gamespy/md5c.c"
+#include <GameSpy/md5c.c>
 #include <ctype.h>
 
 #define DEFAULT_MODULE_HASH "3CAABCFCFF6F3A810019C6A72180F166"

diff --git a/src/xrGame/Level_network_digest_computer.cpp b/src/xrGame/Level_network_digest_computer.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "Level.h"
-#include "xrGameSpy/gamespy/md5.h"
+#include <GameSpy/md5.h>
 
 extern	void	GetCDKey_FromRegistry(char* CDKeyStr);
 char const * ComputeClientDigest(string128& dest)

diff --git a/src/xrGame/awards_store.h b/src/xrGame/awards_store.h
@@ -4,7 +4,7 @@
 #include "xrCore/Containers/AssociativeVector.hpp"
 #include "Common/Noncopyable.hpp"
 #include "profile_data_types.h"
-#include "xrGameSpy/GameSpy/sake/sake.h"
+#include <GameSpy/sake/sake.h>
 #include "gsc_dsigned_ltx.h"
 
 class CGameSpy_Full;

diff --git a/src/xrGame/best_scores_store.h b/src/xrGame/best_scores_store.h
@@ -3,7 +3,7 @@
 
 #include "Common/Noncopyable.hpp"
 #include "xrCore/Containers/AssociativeVector.hpp"
-#include "xrGameSpy/GameSpy/sake/sake.h"
+#include <GameSpy/sake/sake.h>
 #include "profile_data_types.h"
 
 class CGameSpy_Full;

diff --git a/src/xrGame/xrGame.vcxproj b/src/xrGame/xrGame.vcxproj
@@ -210,7 +210,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="..\xrGameSpy\gamespy\md5.h" />
+    <ClInclude Include="..\Externals\GameSpy\src\GameSpy\md5.h" />
     <ClInclude Include="..\xrServerEntities\ai_sounds.h" />
     <ClInclude Include="..\xrServerEntities\alife_human_brain.h" />
     <ClInclude Include="..\xrServerEntities\alife_human_brain_inline.h" />
@@ -1671,7 +1671,7 @@
     <ClInclude Include="ZudaArtifact.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\xrGameSpy\gamespy\md5c.c">
+    <ClCompile Include="..\Externals\GameSpy\src\GameSpy\md5c.c">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>

diff --git a/src/xrGame/xrGame.vcxproj.filters b/src/xrGame/xrGame.vcxproj.filters
@@ -4770,9 +4770,6 @@
     <ClInclude Include="Level_network_map_sync.h">
       <Filter>Core\Client\Level\LevelMapSync</Filter>
     </ClInclude>
-    <ClInclude Include="..\xrGameSpy\gamespy\md5.h">
-      <Filter>Core\Client\Level\ClientDigestComputer</Filter>
-    </ClInclude>
     <ClInclude Include="DemoInfo.h">
       <Filter>Core\Client\Level\LevelNetworkDemo</Filter>
     </ClInclude>
@@ -6651,6 +6648,9 @@
     <ClInclude Include="CdkeyDecode\cdkeydecode.h">
       <Filter>Core\Server\CdkeyDecode</Filter>
     </ClInclude>
+    <ClInclude Include="..\Externals\GameSpy\src\GameSpy\md5.h">
+      <Filter>Core\Client\Level\ClientDigestComputer</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="damage_manager.cpp">
@@ -8165,9 +8165,6 @@
     <ClCompile Include="Level_network_digest_computer.cpp">
       <Filter>Core\Client\Level\ClientDigestComputer</Filter>
     </ClCompile>
-    <ClCompile Include="..\xrGameSpy\gamespy\md5c.c">
-      <Filter>Core\Client\Level\ClientDigestComputer</Filter>
-    </ClCompile>
     <ClCompile Include="DemoInfo.cpp">
       <Filter>Core\Client\Level\LevelNetworkDemo</Filter>
     </ClCompile>
@@ -10160,6 +10157,9 @@
     <ClCompile Include="CdkeyDecode\cdkeydecode.c">
       <Filter>Core\Server\CdkeyDecode</Filter>
     </ClCompile>
+    <ClCompile Include="..\Externals\GameSpy\src\GameSpy\md5c.c">
+      <Filter>Core\Client\Level\ClientDigestComputer</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="ai\monsters\chimera\chimera_attack_state.h">

diff --git a/src/xrGameSpy/gamespy/Chat/changelog.txt b/src/xrGameSpy/gamespy/Chat/changelog.txt