From 89e33738c02110073b8ea9f7c713e4d7a0f4f367 Mon Sep 17 00:00:00 2001
From: Scobalula <theredfoxyt@gmail.com>
Date: Wed, 8 Apr 2020 11:37:21 +0100
Subject: [PATCH] MW4 Fixes

---
 src/WraithX/WraithX/WraithX.vcxproj              |  4 ++++
 src/WraithXCOD/WraithXCOD/GameModernWarfare4.cpp | 13 +++++++------
 src/WraithXCOD/WraithXCOD/WraithXCOD.rc          |  8 ++++----
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/WraithX/WraithX/WraithX.vcxproj b/src/WraithX/WraithX/WraithX.vcxproj
index baa805c..a7463a7 100644
--- a/src/WraithX/WraithX/WraithX.vcxproj
+++ b/src/WraithX/WraithX/WraithX.vcxproj
@@ -49,6 +49,8 @@
       <PreprocessorDefinitions>WIN32;_CRT_NO_VA_START_VALIDATION;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>..\ExternalDeps\Flac1.3.2\include;..\ExternalDeps\DirectXTexApril17\DirectXTex;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <LanguageStandard>
+      </LanguageStandard>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -69,6 +71,8 @@
       <PreprocessorDefinitions>WIN32;_CRT_NO_VA_START_VALIDATION;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>..\ExternalDeps\Flac1.3.2\include;..\ExternalDeps\DirectXTexApril17\DirectXTex;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <LanguageStandard>
+      </LanguageStandard>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
diff --git a/src/WraithXCOD/WraithXCOD/GameModernWarfare4.cpp b/src/WraithXCOD/WraithXCOD/GameModernWarfare4.cpp
index 4cff420..6ed6fcc 100644
--- a/src/WraithXCOD/WraithXCOD/GameModernWarfare4.cpp
+++ b/src/WraithXCOD/WraithXCOD/GameModernWarfare4.cpp
@@ -597,11 +597,12 @@ std::unique_ptr<XAnim_t> GameModernWarfare4::ReadXAnim(const CoDAnim_t* Animatio
         //}
 
         // Check for additive animations
-        if (AnimData.AssetType == 0x6)
-        {
-            // This is a additive animation
-            Anim->AdditiveAnimation = true;
-        }
+        // No point, breaks it in SETools, wait for Cast to implement full Additive support
+        //if (AnimData.AssetType == 0x6)
+        //{
+        //    // This is a additive animation
+        //    Anim->AdditiveAnimation = true;
+        //}
         // Check for looping
         Anim->LoopingAnimation = (AnimData.Flags & 1);
 
@@ -1226,7 +1227,7 @@ void GameModernWarfare4::LoadXModel(const XModelLod_t& ModelLOD, const std::uniq
 std::string GameModernWarfare4::LoadStringEntry(uint64_t Index)
 {
     // Read and return (Offsets[3] = StringTable)
-    return CoDAssets::GameInstance->ReadNullTerminatedString((36 * Index) + CoDAssets::GameOffsetInfos[5] + 8);
+    return CoDAssets::GameInstance->ReadNullTerminatedString((40 * Index) + CoDAssets::GameOffsetInfos[5] + 8);
 }
 void GameModernWarfare4::PerformInitialSetup()
 {
diff --git a/src/WraithXCOD/WraithXCOD/WraithXCOD.rc b/src/WraithXCOD/WraithXCOD/WraithXCOD.rc
index bc930a0..7a62f53 100644
--- a/src/WraithXCOD/WraithXCOD/WraithXCOD.rc
+++ b/src/WraithXCOD/WraithXCOD/WraithXCOD.rc
@@ -361,8 +361,8 @@ IDI_CHECKMARK           ICON                    "..\\..\\WraithX\\Resources\\Che
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,3,96,0
- PRODUCTVERSION 1,3,96,0
+ FILEVERSION 1,3,98,0
+ PRODUCTVERSION 1,3,98,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -379,12 +379,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "DTZxPorter / Scobalula"
             VALUE "FileDescription", "Greyhound"
-            VALUE "FileVersion", "1.3.96.0"
+            VALUE "FileVersion", "1.3.98.0"
             VALUE "InternalName", "Greyhound"
             VALUE "LegalCopyright", "Copyright (C) 2019 DTZxPorter / Scobalula"
             VALUE "OriginalFilename", "Greyhound.exe"
             VALUE "ProductName", "Greyhound"
-            VALUE "ProductVersion", "1.3.96.0"
+            VALUE "ProductVersion", "1.3.98.0"
         END
     END
     BLOCK "VarFileInfo"