From abab38d764b9bb36fe58dc56b6a41814f1b1b36a Mon Sep 17 00:00:00 2001 From: ThirteenAG Date: Fri, 12 Jan 2024 13:19:24 +0800 Subject: [PATCH 1/4] move loading limiter to game init - this will keep startup times unaffected --- source/framelimit.ixx | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/source/framelimit.ixx b/source/framelimit.ixx index c6adac84..6bca1e34 100644 --- a/source/framelimit.ixx +++ b/source/framelimit.ixx @@ -240,17 +240,18 @@ public: } }; injector::MakeInline(pattern.get_first(0), pattern.get_first(6)); } + }; + FusionFix::onGameInitEvent() += []() + { // Off Route infinite loading - { - auto pattern = hook::pattern("E8 ? ? ? ? 83 C4 08 84 C0 74 E2"); - if (!pattern.empty()) - injector::MakeCALL(pattern.get_first(), sub_403CD0, true); + auto pattern = hook::pattern("E8 ? ? ? ? 83 C4 08 84 C0 74 E2"); + if (!pattern.empty()) + injector::MakeCALL(pattern.get_first(), sub_403CD0, true); - pattern = hook::pattern("E8 ? ? ? ? 83 C4 0C 84 C0 75 25"); - if (!pattern.empty()) - injector::MakeCALL(pattern.get_first(), sub_403CD0, true); - } + pattern = hook::pattern("E8 ? ? ? ? 83 C4 0C 84 C0 75 25"); + if (!pattern.empty()) + injector::MakeCALL(pattern.get_first(), sub_403CD0, true); }; FusionFix::onShutdownEvent() += []() From f50f6808986890650631e1be6fb5dfe6cc9e3989 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 12 Jan 2024 08:26:22 +0300 Subject: [PATCH 2/4] Bump the submodules group with 1 update (#403) Bumps the submodules group with 1 update: [shaders/GTAIV.EFLC.FusionShaders](https://github.com/Parallellines0451/GTAIV.EFLC.FusionShaders). Updates `shaders/GTAIV.EFLC.FusionShaders` from `ae75cc9` to `d9f0a1a` - [Release notes](https://github.com/Parallellines0451/GTAIV.EFLC.FusionShaders/releases) - [Commits](https://github.com/Parallellines0451/GTAIV.EFLC.FusionShaders/compare/ae75cc9b0f32ec7d8333a6d9406fe7f6334d666c...d9f0a1acf35a0f9f70ea65110e4f822d165a546d) --- updated-dependencies: - dependency-name: shaders/GTAIV.EFLC.FusionShaders dependency-type: direct:production dependency-group: submodules ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- 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 ae75cc9b..d9f0a1ac 160000 --- a/shaders/GTAIV.EFLC.FusionShaders +++ b/shaders/GTAIV.EFLC.FusionShaders @@ -1 +1 @@ -Subproject commit ae75cc9b0f32ec7d8333a6d9406fe7f6334d666c +Subproject commit d9f0a1acf35a0f9f70ea65110e4f822d165a546d From a3f1c5f2ee7d6514bc292a9504abd33f2e32a9cd Mon Sep 17 00:00:00 2001 From: ThirteenAG Date: Fri, 12 Jan 2024 14:09:11 +0800 Subject: [PATCH 3/4] fix pattern usage --- source/frameratevigilante.ixx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/frameratevigilante.ixx b/source/frameratevigilante.ixx index eb34803c..d589c2e4 100644 --- a/source/frameratevigilante.ixx +++ b/source/frameratevigilante.ixx @@ -52,9 +52,9 @@ public: } pattern = hook::pattern("F3 0F 10 05 ? ? ? ? F3 0F 58 C1 F3 0F 11 05 ? ? ? ? EB 36"); - static auto f1032790 = *pattern.get_first(4); if (!pattern.empty()) { + static auto f1032790 = *pattern.get_first(4); struct LoadingTextSpeed { void operator()(SafetyHookContext& regs) From 37bc9a8374ec5d384366d910b98cb38348d7b664 Mon Sep 17 00:00:00 2001 From: Sergey P Date: Fri, 12 Jan 2024 09:16:10 +0300 Subject: [PATCH 4/4] Update msvc_x86.yml --- .github/workflows/msvc_x86.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/msvc_x86.yml b/.github/workflows/msvc_x86.yml index f4f2be4b..3d36f5eb 100644 --- a/.github/workflows/msvc_x86.yml +++ b/.github/workflows/msvc_x86.yml @@ -35,7 +35,7 @@ env: VERINC: ${{ github.event.inputs.version_increment || 'patch' }} concurrency: - group: ${{ github.ref }} + group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true permissions: