fix for updated version

- fixes #1 - fixes #2
ThirteenAG · Nov 18, 2021 · 585fe11 · 585fe11
1 parent 7d94628
commit 585fe11
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/.github/workflows/msvc_x86.yml b/.github/workflows/msvc_x86.yml
@@ -8,7 +8,7 @@ on:
 
 jobs:
   build:
-    runs-on: windows-2019
+    runs-on: windows-2022
     strategy:
       matrix:
         platform: [Win32]
@@ -22,7 +22,7 @@ jobs:
         submodules: 'true'
     - name: Configure build
       run: |
-        ./premake5 vs2019
+        ./premake5 vs2022
     - name: Build
       run: |
         msbuild -m build/MaxPayne3.FusionFix.sln /property:Configuration=${{matrix.buildtype}} /property:Platform=${{matrix.platform}}

diff --git a/premake5.bat b/premake5.bat
@@ -1 +1 @@
-premake5 vs2019
+premake5 vs2022
diff --git a/premake5.exe b/premake5.exe
diff --git a/source/dllmain.cpp b/source/dllmain.cpp
@@ -26,9 +26,10 @@ void Init()
 
     if (bHideSkipButton)
     {
-        auto pattern = hook::pattern("8B C8 89 86 ? ? ? ? E8 ? ? ? ? D9 EE 8B 86 ? ? ? ? 8B 38 83 EC 08");
-        injector::MakeNOP(pattern.count(22).get(0).get<void>(8), 5, true);
-        injector::MakeNOP(pattern.count(22).get(3).get<void>(8), 5, true);
+        auto pattern = hook::pattern("8B C8 89 86 ? ? ? ? E8 ? ? ? ? D9 EE 8B 86 ? ? ? ? 8B 38 83 EC 08 D9 54 24 04 8D 4C 24 3C D9 1C 24 E8 ? ? ? ? F3 0F 7E 00 8B 97 ? ? ? ? 83 EC 18 8B CC 66 0F D6 01 F3 0F 7E 40 ? 66 0F D6 41 ? F3 0F 7E 40 ? 6A 18 68");
+        injector::MakeNOP(pattern.get_first(8), 5, true);
+        pattern = hook::pattern("8B C8 89 86 ? ? ? ? E8 ? ? ? ? D9 EE 8B 86 ? ? ? ? 8B 38 83 EC 08 D9 54 24 04 8D 4C 24 20 D9 1C 24 E8 ? ? ? ? F3 0F 7E 00 8B 97 ? ? ? ? 83 EC 18 8B CC 66 0F D6 01 F3 0F 7E 40 ? 66 0F D6 41 ? F3 0F 7E 40 ? 6A 18 68 ? ? ? ? 66 0F D6 41 ? 8B 8E ? ? ? ? 6A 18");
+        injector::MakeNOP(pattern.get_first(8), 5, true);
     }
 
     if (fOutlinesSizeMultiplier)