From ba6aaed2dd27b3613184d672890ee4df2c67891b Mon Sep 17 00:00:00 2001 From: ThirteenAG Date: Thu, 11 Apr 2024 23:12:25 +0800 Subject: [PATCH] remove uc --- .github/workflows/all.yml | 8 --- .github/workflows/tag.yml | 2 - .../xlive.ual | 1 - premake5.lua | 12 ++-- .../dllmain.cpp | 57 ------------------- 5 files changed, 5 insertions(+), 75 deletions(-) delete mode 100644 data/FlatoutUltimateCarnage.WidescreenFix/xlive.ual delete mode 100644 source/FlatoutUltimateCarnage.WidescreenFix/dllmain.cpp diff --git a/.github/workflows/all.yml b/.github/workflows/all.yml index 71b6c7c8..8accc854 100644 --- a/.github/workflows/all.yml +++ b/.github/workflows/all.yml @@ -414,14 +414,6 @@ jobs: tag: gun artifacts: data/Archives/Gun.WidescreenFix.zip - - name: Flatout Ultimate Carnage Widescreen Fix - uses: ./.github/workflows/release_tag - with: - token: ${{ secrets.GITHUB_TOKEN }} - tag_list: ${{ format('{0},{1}', github.event.inputs.tag_list, inputs.tag_list) }} - tag: flatoutuc - artifacts: data/Archives/FlatoutUltimateCarnage.WidescreenFix.zip - - name: SOCOM U.S. Navy SEALs Fireteam Bravo Fusion Mod uses: ./.github/workflows/release_tag with: diff --git a/.github/workflows/tag.yml b/.github/workflows/tag.yml index 0b323f18..b03ff198 100644 --- a/.github/workflows/tag.yml +++ b/.github/workflows/tag.yml @@ -20,7 +20,6 @@ on: - farcry - flatout - flatout2 - - flatoutuc - fireteambravo1 - fireteambravo2 - fireteambravo3 @@ -117,7 +116,6 @@ env: farcry: "/t:FarCry_WidescreenFix" flatout: "/t:Flatout_WidescreenFix" flatout2: "/t:Flatout2_WidescreenFix" - flatoutuc: "/t:FlatoutUltimateCarnage_WidescreenFix" fireteambravo1: "/t:SOCOM_FireteamBravo_PPSSPP_FusionMod" fireteambravo2: "/t:SOCOM_FireteamBravo2_PPSSPP_FusionMod" fireteambravo3: "/t:SOCOM_FireteamBravo3_PPSSPP_FusionMod" diff --git a/data/FlatoutUltimateCarnage.WidescreenFix/xlive.ual b/data/FlatoutUltimateCarnage.WidescreenFix/xlive.ual deleted file mode 100644 index a36540af..00000000 --- a/data/FlatoutUltimateCarnage.WidescreenFix/xlive.ual +++ /dev/null @@ -1 +0,0 @@ -loadfromscriptsonly \ No newline at end of file diff --git a/premake5.lua b/premake5.lua index c17279c5..e47a729f 100644 --- a/premake5.lua +++ b/premake5.lua @@ -284,13 +284,11 @@ project "Flatout.WidescreenFix" setpaths("Z:/WFP/Games/Flatout/FlatOut/", "flatout.exe") project "Flatout2.WidescreenFix" setpaths("Z:/WFP/Games/Flatout/FlatOut2/", "FlatOut2.exe") -project "FlatoutUltimateCarnage.WidescreenFix" - setpaths("Z:/WFP/Games/Flatout/FlatOut - Ultimate Carnage/", "Fouc.exe") -project "GettingUp.WidescreenFix" - setpaths("Z:/WFP/Games/Marc Ecko's Getting Up 2/", "_Bin/GettingUp.exe", "_Bin/") - targetdir "data/GettingUp.WidescreenFix/_Bin/" - debugargs { "map=M01_HOO_Tranes_Hood_3" } - buildoptions { "/Zc:threadSafeInit-" } +--project "GettingUp.WidescreenFix" +-- setpaths("Z:/WFP/Games/Marc Ecko's Getting Up 2/", "_Bin/GettingUp.exe", "_Bin/") +-- targetdir "data/GettingUp.WidescreenFix/_Bin/" +-- debugargs { "map=M01_HOO_Tranes_Hood_3" } +-- buildoptions { "/Zc:threadSafeInit-" } project "GTA1.WidescreenFix" setpaths("Z:/WFP/Games/Grand Theft Auto/Grand Theft Auto 1 London 1969 1961/", "WINO/Grand Theft Auto.exe", "WINO/scripts/") project "GTA2.WidescreenFix" diff --git a/source/FlatoutUltimateCarnage.WidescreenFix/dllmain.cpp b/source/FlatoutUltimateCarnage.WidescreenFix/dllmain.cpp deleted file mode 100644 index 3534df22..00000000 --- a/source/FlatoutUltimateCarnage.WidescreenFix/dllmain.cpp +++ /dev/null @@ -1,57 +0,0 @@ -#include "stdafx.h" - -void Init() -{ - auto pattern = hook::pattern("B9 ? ? ? ? E8 ? ? ? ? 8B 7C 24 10 6A 65 8B F0 57 89 74 24 28"); - static auto dword_7242B0 = *pattern.get_first(1); - auto nWidth = *(uint32_t*)(dword_7242B0 + 0x8); - auto nHeight = *(uint32_t*)(dword_7242B0 + 0xC); - injector::WriteMemory(dword_7242B0 + 0x904, static_cast(nWidth), true); - injector::WriteMemory(dword_7242B0 + 0x908, static_cast(nHeight), true); - - pattern = hook::pattern("D9 44 24 04 D9 99 04 09 00 00 D9 44"); // 0x608970 - struct SetAR - { - void operator()(injector::reg_pack& regs) - { - float temp = 0.0f; - _asm fstp dword ptr[temp] - _asm fstp dword ptr[temp] - - auto nWidth = *(uint32_t*)(dword_7242B0 + 0x8); - auto nHeight = *(uint32_t*)(dword_7242B0 + 0xC); - *(float*)(regs.ecx + 0x904) = static_cast(nWidth); - *(float*)(regs.ecx + 0x908) = static_cast(nHeight); - } - }; injector::MakeInline(pattern.get_first(0), pattern.get_first(20)); - - //pattern = hook::pattern(""); // - //struct Hook - //{ - // void operator()(injector::reg_pack& regs) - // { - // float temp = 0.0f; - // _asm fstp dword ptr[temp] - // - // *(float*)(regs.edx + 0x54) = temp / 2.0f; - // regs.edx = *(uint32_t*)(regs.ecx + 0x2C); - // } - //}; injector::MakeInline(0x46FF14, 0x46FF14+6); -} - -CEXP void InitializeASI() -{ - std::call_once(CallbackHandler::flag, []() - { - CallbackHandler::RegisterCallback(Init, hook::pattern("B9 ? ? ? ? E8 ? ? ? ? 8B 7C 24 10 6A 65 8B F0 57 89 74 24 28")); - }); -} - -BOOL APIENTRY DllMain(HMODULE hModule, DWORD reason, LPVOID lpReserved) -{ - if (reason == DLL_PROCESS_ATTACH) - { - if (!IsUALPresent()) { InitializeASI(); } - } - return TRUE; -} \ No newline at end of file