From 138e7d99afe3dd40e198219675b03ddf71181733 Mon Sep 17 00:00:00 2001
From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com>
Date: Wed, 7 Dec 2022 01:03:07 +0100
Subject: [PATCH] Update '-forceborder' comments and add patch documentation
 file

The documentation file for all patches applied to 'r5apex.exe' could be found in 'r5dev/resource/patch/r5apex.patch'. This is a text file containing the offset to the patch and its original instructions followed by the new instructions.
---
 r5dev/engine/matsys_interface.cpp | 19 +++++++------------
 r5dev/resource/patch/r5apex.patch |  1 +
 2 files changed, 8 insertions(+), 12 deletions(-)
 create mode 100644 r5dev/resource/patch/r5apex.patch

diff --git a/r5dev/engine/matsys_interface.cpp b/r5dev/engine/matsys_interface.cpp
index 2b3e5608..979d54a6 100644
--- a/r5dev/engine/matsys_interface.cpp
+++ b/r5dev/engine/matsys_interface.cpp
@@ -4,26 +4,21 @@
 #include "engine/matsys_interface.h"
 
 // Disabled, as this patch **only** works if we are writing the file.
-// See 'resource/ptc/' for more details regarding how this bug has been
-// fixed in the engine module.
+// See 'resource/patch/patch_r5apex.exe' for more details regarding how
+// this bug has been fixed in the engine module.
 /*
 //-----------------------------------------------------------------------------
 // Updates the material system config
 //-----------------------------------------------------------------------------
 bool UpdateCurrentVideoConfig(MaterialSystem_Config_t* pConfig)
 {
-	// This is a bug in Respawn's engine.
-	// In 'OverrideMaterialSystemConfigFromCommandLine',
-	// They added a cmdline check for '-noborder' and '-forceborder'.
-	// However, '-noborder' and 'forceborder' perform the exact same operation.
-	// Both feature the or instruction, there was unfortunately not
-	// enough bytes left to assemble a 'not and' operation to mitigate 
-	// this bug without code caves, which is why we create this hook to remove the
-	// flag after it has been ran in 'OverrideMaterialSystemConfigFromCommandLine',
-	// but before 'UpdateCurrentVideoConfig' so that the file gets created properly.
+	// This is a bug in Respawn's engine. In
+	// 'OverrideMaterialSystemConfigFromCommandLine', they added
+	// a cmdline check for '-noborder' and '-forceborder'. However,
+	// '-noborder' and 'forceborder' perform the exact same operation.
 	if (CommandLine()->FindParm("-forceborder"))
 	{
-		pConfig->m_Flags &= ~3U;
+		pConfig->m_Flags &= ~2U;
 	}
 
 	return v_UpdateCurrentVideoConfig(pConfig);
diff --git a/r5dev/resource/patch/r5apex.patch b/r5dev/resource/patch/r5apex.patch
new file mode 100644
index 00000000..67597c33
--- /dev/null
+++ b/r5dev/resource/patch/r5apex.patch
@@ -0,0 +1 @@
+0x249DEE: "or      byte ptr [rdi+14h], 3" --> "and     byte ptr [rdi+14h], 0FDh"; // This fixes an engine bug where '-forceborder' did not force the border over the application window.