From 5ff93a9bad34301773659eb8724c471dd958055a Mon Sep 17 00:00:00 2001 From: GillianMC <70141395+SandeMC@users.noreply.github.com> Date: Sat, 2 Nov 2024 22:28:42 +0000 Subject: [PATCH 1/6] idk how but this breaks the loading text entirely --- source/frameratevigilante.ixx | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/source/frameratevigilante.ixx b/source/frameratevigilante.ixx index d72347b3..4d5c23d3 100644 --- a/source/frameratevigilante.ixx +++ b/source/frameratevigilante.ixx @@ -51,20 +51,6 @@ public: }; injector::MakeInline(pattern.get_first(0), pattern.get_first(6)); } - pattern = find_pattern("F3 0F 10 05 ? ? ? ? F3 0F 58 C1 F3 0F 11 05 ? ? ? ? EB 36", "F3 0F 10 05 ? ? ? ? F3 0F 58 05 ? ? ? ? F3 0F 11 05 ? ? ? ? EB 30"); - if (!pattern.empty()) - { - static auto f1032790 = *pattern.get_first(4); - struct LoadingTextSpeed - { - void operator()(injector::reg_pack& regs) - { - regs.xmm0.f32[0] = *f1032790 * *CTimer::fTimeStep; - regs.xmm0.f32[0] += regs.xmm1.f32[0]; - } - }; injector::MakeInline(pattern.get_first(0), pattern.get_first(12)); - } - pattern = hook::pattern("F3 0F 58 0D ? ? ? ? 0F 5B C0 F3 0F 11 0D"); if (!pattern.empty()) { @@ -121,4 +107,4 @@ public: } }; } -} FramerateVigilante; \ No newline at end of file +} FramerateVigilante; From 0ff569c80bcedb6f331eb4ce33f754cb180a8cf5 Mon Sep 17 00:00:00 2001 From: GillianMC <70141395+SandeMC@users.noreply.github.com> Date: Sat, 2 Nov 2024 22:34:55 +0000 Subject: [PATCH 2/6] Update readme.md --- readme.md | 1 + 1 file changed, 1 insertion(+) diff --git a/readme.md b/readme.md index 01b5b0e8..7f56cfc1 100644 --- a/readme.md +++ b/readme.md @@ -24,6 +24,7 @@ The original repository has no support for GFWL (it does have support for outdat - Change the default option of `SkipMenu` to 0 to be able to load into DLC's first. - Change the default option of `RecoilFix` to 0 to avoid being as disadvantage to other players in the multiplayer. - Enable Windowed by default, which also enables Borderless and No Block on Focus Loss. +- Fixed loading text (by removing a fix? huh?) Keep in mind that you still want additional mods to be used for a pleasant GFWL multiplayer experience, including disabling the mod check to even allow this fork to work. From f79a1df7186401676dc2410bdf7da5ee35208b53 Mon Sep 17 00:00:00 2001 From: GillianMC <70141395+SandeMC@users.noreply.github.com> Date: Sun, 3 Nov 2024 21:54:13 +0000 Subject: [PATCH 3/6] this also breaks :/ --- source/frameratevigilante.ixx | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/source/frameratevigilante.ixx b/source/frameratevigilante.ixx index 4d5c23d3..d17dd1e2 100644 --- a/source/frameratevigilante.ixx +++ b/source/frameratevigilante.ixx @@ -86,25 +86,6 @@ public: } }; injector::MakeInline(pattern.get_first(0), pattern.get_first(8)); } - - // Cop blips - static int CustomFrameCounter = 0; - pattern = hook::pattern("A1 ? ? ? ? 6B C0 15"); - if (!pattern.empty()) - injector::WriteMemory(pattern.get_first(1), &CustomFrameCounter, true); - - pattern = hook::pattern("FF 05 ? ? ? ? F3 0F 2C C0"); - if (!pattern.empty()) - { - static auto CounterHook = safetyhook::create_mid(pattern.get_first(), [](SafetyHookContext& regs) - { - static float accumulator = 0.0f; - accumulator += (*CTimer::fTimeStep / (1.0f / 30.0f)); - int increment = static_cast(accumulator); - CustomFrameCounter += increment; - accumulator -= increment; - }); - } }; } } FramerateVigilante; From 95e527ad3f5eb298e7120876f5364c4515f98495 Mon Sep 17 00:00:00 2001 From: GillianMC <70141395+SandeMC@users.noreply.github.com> Date: Sun, 3 Nov 2024 21:54:29 +0000 Subject: [PATCH 4/6] Update readme.md --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index 7f56cfc1..dbf0c4e9 100644 --- a/readme.md +++ b/readme.md @@ -24,7 +24,7 @@ The original repository has no support for GFWL (it does have support for outdat - Change the default option of `SkipMenu` to 0 to be able to load into DLC's first. - Change the default option of `RecoilFix` to 0 to avoid being as disadvantage to other players in the multiplayer. - Enable Windowed by default, which also enables Borderless and No Block on Focus Loss. -- Fixed loading text (by removing a fix? huh?) +- Fixed loading text glow and broken cop blips (by removing a fix? huh?) Keep in mind that you still want additional mods to be used for a pleasant GFWL multiplayer experience, including disabling the mod check to even allow this fork to work. From 5fa4b7dc4a6f70e522c8f6cb1a639aeabe62b8a6 Mon Sep 17 00:00:00 2001 From: ThirteenAG Date: Mon, 4 Nov 2024 23:35:30 +0800 Subject: [PATCH 5/6] fix plugin sdk compatibility --- source/frameratevigilante.ixx | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/source/frameratevigilante.ixx b/source/frameratevigilante.ixx index d72347b3..c21b0f06 100644 --- a/source/frameratevigilante.ixx +++ b/source/frameratevigilante.ixx @@ -51,7 +51,7 @@ public: }; injector::MakeInline(pattern.get_first(0), pattern.get_first(6)); } - pattern = find_pattern("F3 0F 10 05 ? ? ? ? F3 0F 58 C1 F3 0F 11 05 ? ? ? ? EB 36", "F3 0F 10 05 ? ? ? ? F3 0F 58 05 ? ? ? ? F3 0F 11 05 ? ? ? ? EB 30"); + pattern = hook::pattern("F3 0F 10 05 ? ? ? ? F3 0F 58 C1 F3 0F 11 05 ? ? ? ? EB 36"); if (!pattern.empty()) { static auto f1032790 = *pattern.get_first(4); @@ -89,7 +89,7 @@ public: } // CD/busy spinner - pattern = find_pattern("F3 0F 58 05 ? ? ? ? 33 C0 A3 ? ? ? ? F3 0F 11 05"); + pattern = hook::pattern("F3 0F 58 05 ? ? ? ? 33 C0 A3 ? ? ? ? F3 0F 11 05"); if (!pattern.empty()) { struct CDSpinnerHook @@ -102,14 +102,11 @@ public: } // Cop blips - static int CustomFrameCounter = 0; - pattern = hook::pattern("A1 ? ? ? ? 6B C0 15"); - if (!pattern.empty()) - injector::WriteMemory(pattern.get_first(1), &CustomFrameCounter, true); - - pattern = hook::pattern("FF 05 ? ? ? ? F3 0F 2C C0"); + pattern = hook::pattern("F3 0F 10 4C 24 ? 0F 28 C1 F3 0F 59 C2"); if (!pattern.empty()) { + static int CustomFrameCounter = 0; + static auto CounterHook = safetyhook::create_mid(pattern.get_first(), [](SafetyHookContext& regs) { static float accumulator = 0.0f; @@ -118,6 +115,10 @@ public: CustomFrameCounter += increment; accumulator -= increment; }); + + pattern = hook::pattern("A1 ? ? ? ? 6B C0 15"); + if (!pattern.empty()) + injector::WriteMemory(pattern.get_first(1), &CustomFrameCounter, true); } }; } From a0cce46f7dd256edf3f91de918e86a04f4af56bb Mon Sep 17 00:00:00 2001 From: ThirteenAG Date: Mon, 4 Nov 2024 23:35:36 +0800 Subject: [PATCH 6/6] update submodules --- shaders/GTAIV.EFLC.FusionShaders | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shaders/GTAIV.EFLC.FusionShaders b/shaders/GTAIV.EFLC.FusionShaders index c36e2ac3..1a7823a7 160000 --- a/shaders/GTAIV.EFLC.FusionShaders +++ b/shaders/GTAIV.EFLC.FusionShaders @@ -1 +1 @@ -Subproject commit c36e2ac3d8b0d363ea2d1e920197d8da9d4db0da +Subproject commit 1a7823a76c84cbc24ed42ea0a86ea3ce9a96f0bf