GFWL Patch

Resolve merge conflict Update readme.md Change the default value of RecoilFix Update readme.md Update readme.md add disclaimer Fix missing Multiplayer button on the phone Fix merge conflict Update readme.md Update readme.md Update readme.md Change the default option of SkipMenu to 0 Fix the img building Add priority to the phone fixes Update readme.md Update readme.md Remove the new `xlive.dll` check Remove the new `xlive.dll` check, remove FusionTrees from the build tree, rename PhoneFix files to GFWLPatch Update readme.md Make a one-click script Compilation instructions Forgot about recursive. Further improve(?) the building script Adjust the build script to my repository Change from binary to plain text didn't have to remove that teehee Update readme.md Update readme.md Update readme.md Update readme.md Update readme.md Update readme.md Update readme.md Restore FusionTrees as I may have been mistaken Update readme.md make the readme more readable add incompatible zpatch options self-advertisement yes remove this bit Update readme.md this probably also counts Update readme.md Update readme.md Update readme.md webhook forgot to edit Update github-releases-to-discord.yml Update msvc_x86.yml Update .gitattributes Fix 1.0.8.0 compatibility Update README.md Merge to upstream Update readme.md Fix fix issues from merging Remove the `xlive.dll` check Update readme.md Change the default value of RecoilFix Update readme.md Update readme.md add disclaimer Fix missing Multiplayer button on the phone Separate the phone fixes; fix the Multiplayer button in prologue; accidentally 'fix' mp tutorial? Update readme.md Update readme.md Update readme.md Change the default option of SkipMenu to 0 Fix the img building Add priority to the phone fixes Update readme.md Update readme.md Remove the new `xlive.dll` check Remove the new `xlive.dll` check, remove FusionTrees from the build tree, rename PhoneFix files to GFWLPatch Update readme.md Make a one-click script Compilation instructions Forgot about recursive. Further improve(?) the building script Adjust the build script to my repository Fix leaderboards Remove unnecessary mods from the blacklist Change from binary to plain text didn't have to remove that teehee Update readme.md Update readme.md Update readme.md Update readme.md Update readme.md Update readme.md Update readme.md Restore FusionTrees as I may have been mistaken Update readme.md make the readme more readable add incompatible zpatch options self-advertisement yes remove this bit Merge to upstream it doesn't let 1080 boot and im too dumb to work with patterns to actually try to fix it Update readme.md this probably also counts Update readme.md Update readme.md Update readme.md webhook forgot to edit Update github-releases-to-discord.yml Fix merge conflict (actually fix it, i'm stupid) Update msvc_x86.yml altdialogue fix - fixes ThirteenAG#429 Update .gitattributes Fix 1.0.8.0 compatibility Update README.md Merge to upstream Update readme.md I'm a stupid the
gillian-guide · Aug 16, 2024 · c79929a · c79929a
1 parent 0f8f762
commit c79929a
Show file tree

Hide file tree

Showing 20 changed files with 147 additions and 103 deletions.
diff --git a/.github/workflows/github-releases-to-discord.yml b/.github/workflows/github-releases-to-discord.yml
@@ -0,0 +1,18 @@
+on:
+  release:
+    types: [published]
+
+jobs:
+  github-releases-to-discord:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Github Releases To Discord
+        uses: SethCohen/github-releases-to-discord@v1.13.0
+        with:
+          webhook_url: ${{ secrets.WEBHOOK_URL }}
+          color: "2105893"
+          username: "FusionFix-GFWL Updates"
+          avatar_url: "https://github.com/gillian-guide/gillian-guide.github.io/blob/main/docs/assets/iv-logo-favicon.png?raw=true"
+          reduce_headings: true
diff --git a/.github/workflows/msvc_x86.yml b/.github/workflows/msvc_x86.yml
@@ -11,28 +11,6 @@ on:
     paths-ignore:
       - "**/*.md"
       - '**/*.txt'
-  workflow_dispatch:
-    inputs:
-      release:
-        description: "Create a release"
-        type: choice
-        required: false
-        default: 'false'
-        options:
-          - 'true'
-          - 'false'
-      version_increment:
-        description: "Default semantic version release type"
-        type: choice
-        required: false
-        default: 'minor'
-        options:
-          - 'major'
-          - 'minor'
-          - 'patch'
-
-env:
-  VERINC: ${{ github.event.inputs.version_increment || 'patch' }}
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -54,16 +32,8 @@ jobs:
     - name: Add msbuild to PATH
       uses: microsoft/setup-msbuild@main
 
-    - name: Auto Increment Version
-      uses: MCKanpolat/auto-semver-action@v2
-      id: versioning
-      with:
-        releaseType: ${{ env.VERINC }}
-        incrementPerCommit: false
-        github_token: ${{ secrets.GITHUB_TOKEN }}
-
     - name: Configure build
-      run: ./premake5 vs2022 --with-version=${{ steps.versioning.outputs.version }}
+      run: ./premake5 vs2022 --with-version=vs2022
 
     - name: Build
       run: |
@@ -89,30 +59,6 @@ jobs:
     - name: Upload artifact
       uses: actions/upload-artifact@v4
       with:
-        name: GTAIV.EFLC.FusionFix
-        path: |
-          data/*
-          !data/update/GTAIV.EFLC.FusionFix/GTAIV.EFLC.FusionFix
-          !data/update/GTAIV.EFLC.FusionFix/GTAIV.FusionFix
-          !data/update/GTAIV.EFLC.FusionFix/TLAD.FusionFix
-          !data/update/GTAIV.EFLC.FusionFix/TBOGT.FusionFix
-          !data/update/GTAIV.EFLC.FusionFix/FusionTrees
-          !data/update/GTAIV.EFLC.FusionFix/FusionLights
-          !data/update/GTAIV.EFLC.FusionFix/cdimagemake.ims
-          !**/.gitkeep
-
-    - name: Upload Release
-      if: |
-        github.event.inputs.release == 'true' &&
-        github.ref_name == 'master' &&
-        (github.event_name == 'push' || github.event_name == 'workflow_dispatch') &&
-        github.repository == 'ThirteenAG/GTAIV.EFLC.FusionFix'
-      uses: ncipollo/release-action@main
-      with:
-        token: ${{ secrets.GITHUB_TOKEN }}
-        allowUpdates: false
-        name: GTAIV.EFLC.FusionFix v${{ steps.versioning.outputs.version }}
-        body: "[README](https://github.com/ThirteenAG/GTAIV.EFLC.FusionFix#readme)"
-        tag: v${{ steps.versioning.outputs.version }}
-        artifacts: GTAIV.EFLC.FusionFix.zip
+        name: GTAIV.EFLC.FusionFix-GFWL
+        path: release/*
 
diff --git a/.gitignore b/.gitignore
@@ -345,3 +345,5 @@ data/update/common/text/*.gxt
 data/update/TLAD/pc/textures/*.wtd
 data/plugins/GTAIV.EFLC.FusionFix.asi
 GTAIV.EFLC.FusionFix.zip
+
+release/
diff --git a/.gitmodules b/.gitmodules
@@ -13,4 +13,4 @@
 	ignore = dirty
 [submodule "external/modupdater"]
 	path = external/modupdater
-	url = https://github.com/ThirteenAG/modupdater
+	url = https://github.com/ThirteenAG/modupdater
diff --git a/data/plugins/GTAIV.EFLC.FusionFix.ini b/data/plugins/GTAIV.EFLC.FusionFix.ini
@@ -1,5 +1,5 @@
 [MAIN]
-RecoilFix = 1
+RecoilFix = 0
 AimingZoomFix = 1
 
 [SHADOWS]

diff --git a/data/update/GTAIV.EFLC.FusionFix/GTAIV.GFWLPatch/multitutorial.sco b/data/update/GTAIV.EFLC.FusionFix/GTAIV.GFWLPatch/multitutorial.sco
diff --git a/data/update/GTAIV.EFLC.FusionFix/GTAIV.GFWLPatch/spcellphonemain.sco b/data/update/GTAIV.EFLC.FusionFix/GTAIV.GFWLPatch/spcellphonemain.sco
diff --git a/data/update/GTAIV.EFLC.FusionFix/GTAIV.GFWLPatch/spcellphonenetwork.sco b/data/update/GTAIV.EFLC.FusionFix/GTAIV.GFWLPatch/spcellphonenetwork.sco
diff --git a/data/update/GTAIV.EFLC.FusionFix/GTAIV.GFWLPatch/spcellphonetutorial.sco b/data/update/GTAIV.EFLC.FusionFix/GTAIV.GFWLPatch/spcellphonetutorial.sco
diff --git a/data/update/GTAIV.EFLC.FusionFix/TBOGT.GFWLPatch/spcellphonemain.sco b/data/update/GTAIV.EFLC.FusionFix/TBOGT.GFWLPatch/spcellphonemain.sco
diff --git a/data/update/GTAIV.EFLC.FusionFix/TLAD.GFWLPatch/spcellphonemain.sco b/data/update/GTAIV.EFLC.FusionFix/TLAD.GFWLPatch/spcellphonemain.sco
diff --git a/data/update/GTAIV.EFLC.FusionFix/cdimagemake.ims b/data/update/GTAIV.EFLC.FusionFix/cdimagemake.ims
@@ -1,24 +1,45 @@
--create "GTAIV.EFLC.FusionFix.img" "3" "IMG_VERSION_3_ENCRYPTION_TYPE_NONE"
+-create "..\\..\\..\\release\\update\\GTAIV.EFLC.FusionFix\\GTAIV.EFLC.FusionFix.img" "3" "IMG_VERSION_3_ENCRYPTION_TYPE_NONE"
 -importFromDirectory "GTAIV.EFLC.FusionFix"
 -rebuild
 -close
 
--create "IV\\GTAIV.FusionFix.img" "3" "IMG_VERSION_3_ENCRYPTION_TYPE_NONE"
+-create "..\\..\\..\\release\\update\\GTAIV.EFLC.FusionFix\\IV\\GTAIV.FusionFix.img" "3" "IMG_VERSION_3_ENCRYPTION_TYPE_NONE"
 -importFromDirectory "GTAIV.FusionFix"
 -rebuild
 -close
 
--create "TLAD\\TLAD.FusionFix.img" "3" "IMG_VERSION_3_ENCRYPTION_TYPE_NONE"
+-create "..\\..\\..\\release\\update\\GTAIV.EFLC.FusionFix\\IV\\!GTAIV.GFWLPatch.img" "3" "IMG_VERSION_3_ENCRYPTION_TYPE_NONE"
+-importFromDirectory "GTAIV.GFWLPatch"
+-rebuild
+-close
+
+-create "..\\..\\..\\release\\update\\GTAIV.EFLC.FusionFix\\TLAD\\TLAD.FusionFix.img" "3" "IMG_VERSION_3_ENCRYPTION_TYPE_NONE"
 -importFromDirectory "TLAD.FusionFix"
 -rebuild
 -close
 
--create "TBOGT\\TBOGT.FusionFix.img" "3" "IMG_VERSION_3_ENCRYPTION_TYPE_NONE"
+-create "..\\..\\..\\release\\update\\GTAIV.EFLC.FusionFix\\TLAD\\!TLAD.GFWLPatch.img" "3" "IMG_VERSION_3_ENCRYPTION_TYPE_NONE"
+-importFromDirectory "TLAD.GFWLPatch"
+-rebuild
+-close
+
+-create "..\\..\\..\\release\\update\\GTAIV.EFLC.FusionFix\\TBOGT\\TBOGT.FusionFix.img" "3" "IMG_VERSION_3_ENCRYPTION_TYPE_NONE"
 -importFromDirectory "TBOGT.FusionFix"
 -rebuild
 -close
 
--create "FusionLights.img" "3" "IMG_VERSION_3_ENCRYPTION_TYPE_NONE"
+-create "..\\..\\..\\release\\update\\GTAIV.EFLC.FusionFix\\TBOGT\\!TBOGT.GFWLPatch.img" "3" "IMG_VERSION_3_ENCRYPTION_TYPE_NONE"
+-importFromDirectory "TBOGT.GFWLPatch"
+-rebuild
+-close
+
+-create "..\\..\\..\\release\\update\\GTAIV.EFLC.FusionFix\\FusionTrees.img" "3" "IMG_VERSION_3_ENCRYPTION_TYPE_NONE"
+-importFromDirectory "FusionTrees"
+-rebuild
+-close
+
+
+-create "..\\..\\..\\release\\update\\GTAIV.EFLC.FusionFix\\FusionLights.img" "3" "IMG_VERSION_3_ENCRYPTION_TYPE_NONE"
 -importFromDirectory "FusionLights"
 -rebuild
 -close
diff --git a/exclude.txt b/exclude.txt
@@ -0,0 +1,2 @@
+.gitkeep
+GTAIV.EFLC.FusionFix\
diff --git a/readme.md b/readme.md
@@ -1,13 +1,83 @@
-[![Actions Status: Release](https://github.com/ThirteenAG/GTAIV.EFLC.FusionFix/actions/workflows/msvc_x86.yml/badge.svg)](https://github.com/ThirteenAG/GTAIV.EFLC.FusionFix/actions)
-[![AppVeyor](https://img.shields.io/appveyor/build/ThirteenAG/GTAIV-EFLC-FusionFix?label=AppVeyor%20Build&logo=Appveyor&logoColor=white)](https://ci.appveyor.com/project/ThirteenAG/gtaiv-eflc-fusionfix)
-
 <p align="center">
   <img width="400" src="https://github.com/ThirteenAG/GTAIV.EFLC.FusionFix/assets/4904157/f45efc2e-f4f5-4d4d-847b-0f0d19897ef4.png">
 </p>
 
+## DISCLAIMER
+
+**THIS FORK HAS NO RELATION TO THE OFFICIAL REPOSITORY AND IF YOU HAVE ANY ISSUES SPECIFIC TO THIS FORK, DO NOT CREATE AN ISSUE ON THE OFFICIAL REPOSITORY NOR BOTHER FUSION TEAM WITH IT**
+
+**I'M ALSO NOT DOING ANY HEAVY WORK ON THIS FORK, NOR DO I KNOW HOW MODDING WORKS, NOR DO I KNOW HOW TO CODE WITH C++, NOR DO I KNOW HOW DOES ASM WORK, NOR DO I KNOW HOW TO PORT MODS. DON'T ASK ME TO.**
+
+# GFWL Patch (this fork)
+
+**Just because it says GFWL Patch doesn't mean you can't use this with xliveless.*
+
+**Some features made after v2.4.2 lack an implementation for nonCE, so in some ways, the experience is subpar to CE.*
+
+The original repository has no support for GFWL (it does have support for outdated patches themselves, however - props to Fusion Team for keeping new features in-tact for old versions). This fork attempts to mitigate that with several simple fixes:
+
+- Disable the `xlive.dll` check to remove the warning message about requiring `xlive.dll` and XLiveLessAddon.
+- Block `IVMenuAPI.asi` and `GTAIVExtraOptions.asi` due to breaking compatibility with FusionFix.
+- Fix the missing `Multiplayer` button on the phone by changing a simple check in the `spcellphonemain.sco` and `spcellphonenetwork.sco`. Thanks to [ClaudeIII](https://github.com/ClaudeIII) for helping with the ASM part of the code.
+- Fix the Multiplayer Tutorial. Editing the `spcellphonetutorial.sco` and `multitutorial.sco` made the multiplayer tutorial somewhat functional. Thanks to [sTc2201](https://github.com/sTc2201) for providing the `multitutorial.sco` fixes.
+- Fix crash on viewing leaderboard. Thanks to [sTc2201](https://github.com/sTc2201) for providing the fix.
+- 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.
+
+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.
+
+You can visit the [Grand Theft Auto RevIVal Discord Server](https://discord.gg/gtrf) for more information about GFWL multiplayer and people to play with (this patch was also made for these guys). You can also use [HappinessMP](https://happinessmp.net/) to play online on Complete Edition (doesn't allow any mods including FusionFix, however).
+
+## Installing the GFWL Patch
+
+Install the [official release](https://github.com/ThirteenAG/GTAIV.EFLC.FusionFix/releases/latest) first, move the files out of the `plugins` folder into the root one, then apply [this patch](https://github.com/gillian-guide/GTAIV.EFLC.FusionFix-GFWL/releases/latest) on top of it.
+
+If using ZolikaPatch, also disable following options in `ZolikaPatch.ini` or use the [Setup Utility](https://github.com/gillian-guide/GTAIVSetupUtilityWPF):
+
+- BikePhoneAnimsFix
+- BorderlessWindowed
+- BuildingAlphaFix
+- BuildingDynamicShadows
+- CarDynamicShadowFix
+- CarPartsShadowFix
+- CutsceneFixes
+- DoNotPauseOnMinimize
+- DualVehicleHeadlights
+- EmissiveLerpFix
+- EpisodicVehicleSupport
+- EpisodicWeaponSupport
+- ForceCarHeadlightShadows
+- ForceDynamicShadowsEverywhere
+- ForceShadowsOnObjects
+- HighFPSBikePhysicsFix
+- HighFPSSpeedupFix
+- HighQualityReflections
+- ImprovedShaderStreaming
+- MouseFix
+- NewMemorySystem
+- NoLiveryLimit
+- OutOfCommissionFix
+- PoliceEpisodicWeaponSupport
+- RemoveBoundingBoxCulling
+- ReversingLightFix
+- SkipIntro
+- SkipMenu
+
+## Compiling FusionFix + GFWL Patch manually
+
+[![Actions Status: Release](https://github.com/gillian-guide/GTAIV.EFLC.FusionFix-GFWL/actions/workflows/msvc_x86.yml/badge.svg)](https://github.com/gillian-guide/GTAIV.EFLC.FusionFix-GFWL/actions)
+
+I include the rest of the original repository for the purposes of compiling the mod manually (including the patch) if you wish to do so.
+
+1. Clone this fork recursively (`git clone https://github.com/gillian-guide/GTAIV.EFLC.FusionFix-GFWL.git --recursive`).
+2. Open `premake5.bat` to generate a compileable Visual Studio project.
+3. Compile the project in `build` with whatever tools you prefer - MSBuild, Visual Studio etc.
+4. Launch `release.bat` and wait for it to finish.
+5. The complete thing *should* be in the `release` folder.
+
 # GTAIV.EFLC.FusionFix
 
-This projects aims to fix some issues in Grand Theft Auto IV: The Complete Edition.
+This projects aims to fix some issues in Grand Theft Auto IV: Complete Edition.
 
 Also available for [Max Payne 3](https://github.com/ThirteenAG/MaxPayne3.FusionFix#readme) and [other games](https://thirteenag.github.io/wfp).
 

diff --git a/release.bat b/release.bat
@@ -1,16 +1,14 @@
-copy bin\GTAIV.EFLC.FusionFix.asi data\plugins\GTAIV.EFLC.FusionFix.asi
+del release
+mkdir release
+mkdir release\update\GTAIV.EFLC.FusionFix\IV
+mkdir release\update\GTAIV.EFLC.FusionFix\TLAD
+mkdir release\update\GTAIV.EFLC.FusionFix\TBoGT
+copy bin\GTAIV.EFLC.FusionFix.asi release\GTAIV.EFLC.FusionFix.asi
+copy data\plugins\GTAIV.EFLC.FusionFix.ini release\GTAIV.EFLC.FusionFix.ini
 
 call buildimg.bat
 call buildwtd.bat
 call buildshaders.bat
 call buildgxt.bat
 
-7z a "GTAIV.EFLC.FusionFix.zip" ".\data\*" ^
--x!update\GTAIV.EFLC.FusionFix\GTAIV.EFLC.FusionFix ^
--x!update\GTAIV.EFLC.FusionFix\GTAIV.FusionFix ^
--x!update\GTAIV.EFLC.FusionFix\TLAD.FusionFix ^
--x!update\GTAIV.EFLC.FusionFix\TBOGT.FusionFix ^
--x!update\GTAIV.EFLC.FusionFix\FusionTrees ^
--x!update\GTAIV.EFLC.FusionFix\FusionLights ^
--x!update\GTAIV.EFLC.FusionFix\cdimagemake.ims ^
--xr!*\.gitkeep
+xcopy /s /i data\update\ release\update /exclude:exclude.txt
diff --git a/shaders/GTAIV.EFLC.FusionShaders b/shaders/GTAIV.EFLC.FusionShaders
diff --git a/source/altdialogue.ixx b/source/altdialogue.ixx
@@ -228,9 +228,9 @@ std::vector<std::vector<std::tuple<std::string_view, uint32_t>>> gAltDialogueVar
         { "tonym6", 43689 },
         { "tonym7", 43690 },
         { "tonym8", 43691 },
-        //{ "yusuf2", 42910 },
-        //{ "yusuf3", 43668 },
-        //{ "yusuf4", 42911 },
+        { "yusuf2", 42910 },
+        { "yusuf3", 43668 },
+        { "yusuf4", 42911 },
     }
 };
 

diff --git a/source/comvars.ixx b/source/comvars.ixx
@@ -1200,10 +1200,10 @@ public:
 
         pattern = find_pattern("A1 ? ? ? ? 83 C4 08 8B CF", "A1 ? ? ? ? 80 3F 04");
         CWeather::CurrentWeather = *pattern.get_first<CWeather::eWeatherType*>(1);
-        
+
         pattern = find_pattern("A1 ? ? ? ? 89 46 4C A1", "A1 ? ? ? ? 77 05 A1 ? ? ? ? 80 3F 04");
         CWeather::NextWeather = *pattern.get_first<CWeather::eWeatherType*>(1);
-        
+
         pattern = hook::pattern("F3 0F 10 05 ? ? ? ? 8B 44 24 0C 8B 4C 24 04");
         CWeather::NextWeatherPercentage = *pattern.get_first<float*>(4);
 
@@ -1212,12 +1212,12 @@ public:
 
         pattern = find_pattern("81 EC ? ? ? ? 8D 04 24 68 ? ? ? ? FF B4 24", "8B 44 24 04 81 EC ? ? ? ? 68");
         rage::grcTextureFactoryPC::shCreateTexture = safetyhook::create_inline(pattern.get_first(0), rage::grcTextureFactoryPC::CreateTexture);
-        
+
         pattern = find_pattern("53 8B 5C 24 08 56 33 F6 57 39 35 ? ? ? ? 7E 25 8B 3C B5", "53 8B 5C 24 08 56 57 33 FF 39 3D", "53 8B 5C 24 08 56 33 F6 39 35 ? ? ? ? 57 7E 29 8B 3C B5 ? ? ? ? 8B 07 8B 50 14 53 8B CF FF D2 50 E8 ? ? ? ? 83 C4 08 85 C0");
         rage::grcTextureFactoryPC::shCreateRT = safetyhook::create_inline(pattern.get_first(0), rage::grcTextureFactoryPC::CreateRT);
 
         pattern = find_pattern("53 55 56 57 8B F9 85 FF 74 3F", "53 55 8B 6C 24 0C 56 57 EB 06 8D 9B 00 00 00 00 0F B7 51 14 33 FF 83 EA 01 78 26 8B 59 10", "85 C9 53 55 56 57 74 40 8B 6C 24 14 8D 64 24 00");
-        CTxdStore::getEntryByKey = pattern.get_first<rage::grcTexturePC*(__fastcall)(int*, void*, unsigned int)>(0);
+        CTxdStore::getEntryByKey = pattern.get_first<rage::grcTexturePC * (__fastcall)(int*, void*, unsigned int)>(0);
 
         pattern = hook::pattern("68 ? ? ? ? 68 ? ? ? ? 68 ? ? ? ? 68 ? ? ? ? E8 ? ? ? ? 8B C8 E8 ? ? ? ? A3 ? ? ? ? 5E");
         CTxdStore::at = (int* (__cdecl*)(int))injector::ReadMemory<uint32_t>(pattern.get_first(1), true);

diff --git a/source/dllblacklist.ixx b/source/dllblacklist.ixx
@@ -22,6 +22,8 @@ std::vector<std::wstring> dlllist = {
     L"NahimicMSIOSD.dll",
     L"nhAsusPhoebusOSD.dll", // ASUS Phoebus
     L"MirillisActionVulkanLayer.dll",
+    L"IVMenuAPI.asi",
+    L"GTAIVExtraOptions.asi",
 };
 
 typedef void(WINAPI* LdrLoadDllFunc) (IN PWCHAR PathToFile OPTIONAL, IN PULONG Flags OPTIONAL, IN PUNICODE_STRING ModuleFileName, OUT HMODULE* ModuleHandle);
@@ -64,10 +66,7 @@ export void CompatibilityWarnings()
     auto it = std::find_if(std::begin(dlllist), std::end(dlllist), [](auto& i) { return GetModuleHandleW(i.c_str()); });
 
     if (it == std::end(dlllist))
-        if (GetModuleHandleW(L"xlive"))
-            dllName = L"xlive";
-        else
-            return;
+        return;
     else
         dllName = *it;
 
@@ -85,18 +84,6 @@ export void CompatibilityWarnings()
         L"<a href=\"https://github.com/ThirteenAG/Ultimate-ASI-Loader/releases/latest\">Ultimate ASI Loader</a>\n\n" \
         L"<a href=\"https://github.com/ThirteenAG/Ultimate-ASI-Loader/releases/latest\">https://github.com/ThirteenAG/Ultimate-ASI-Loader/releases/latest</a>";
     }
-    else if (iequals(dllName.stem().wstring(), L"xlive"))
-    {
-        if (IsModuleUAL(GetModuleHandleW(L"xlive")))
-            return;
-
-        szTitle = L"GTAIV.EFLC.FusionFix",
-            szHeader = L"You are running GTA IV The Complete Edition Fusion Fix in backwards compatibility mode.",
-            szContent = L"It requires the latest version of " \
-            L"<a href=\"https://github.com/ThirteenAG/Ultimate-ASI-Loader/releases/latest\">Ultimate ASI Loader</a>" \
-            L" as xlive.dll and " \
-            L"<a href=\"https://github.com/GTAmodding/XLivelessAddon/releases/tag/latest\">XLivelessAddon</a>.";
-    }
     else
     {
         static auto warning = std::wstring(dllName) + L" is injected into " + GetExeModuleName().wstring() + L" process." \

diff --git a/source/settings.ixx b/source/settings.ixx
@@ -198,7 +198,7 @@ public:
         // VOLATILE! DO NOT CHANGE THE ORDER OF THESE! ONLY WORKS BY SOME MIRACLE.
         static CSetting arr[] = {
             { 0, "PREF_SKIP_INTRO",        "MAIN",       "SkipIntro",                       "",                           1, nullptr, 0, 1 },
-            { 0, "PREF_SKIP_MENU",         "MAIN",       "SkipMenu",                        "",                           1, nullptr, 0, 1 },
+            { 0, "PREF_SKIP_MENU",         "MAIN",       "SkipMenu",                        "",                           0, nullptr, 0, 1 },
             { 0, "PREF_BORDERLESS",        "MAIN",       "BorderlessWindowed",              "",                           1, nullptr, 0, 1 },
             { 0, "PREF_FPS_LIMIT_PRESET",  "FRAMELIMIT", "FpsLimitPreset",                  "MENU_DISPLAY_FRAMELIMIT",    0, nullptr, FpsCaps.eOFF, std::distance(std::begin(FpsCaps.data), std::end(FpsCaps.data)) - 1 },
             { 0, "PREF_BLOOM",             "MAIN",       "Bloom",                           "",                           1, nullptr, 0, 1 },