Always enable health on reticle option

ThirteenAG · Oct 31, 2024 · 894e4f8 · 894e4f8
1 parent 62ad290
commit 894e4f8
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 0 deletions.
diff --git a/data/plugins/GTAIV.EFLC.FusionFix.ini b/data/plugins/GTAIV.EFLC.FusionFix.ini
@@ -50,6 +50,7 @@ TreeAlphaPC = 0.625
 TreeAlphaConsole = 4.0
 CoronaReflectionIntensity = 1.0               // controls intensity of coronas in reflections
 ConsoleCarReflectionsAndDirt = 1
+AlwaysDisplayHealthOnReticle = 1
 
 [BudgetedIV]
 VehicleBudget = 0                             // may cause issues, set to e.g. 260000000 to increase budget limit

diff --git a/source/fixes.ixx b/source/fixes.ixx
@@ -70,6 +70,8 @@ public:
             bool bDefaultCameraAngleInTLAD = iniReader.ReadInteger("MISC", "DefaultCameraAngleInTLAD", 0) != 0;
             bool bPedDeathAnimFixFromTBOGT = iniReader.ReadInteger("MISC", "PedDeathAnimFixFromTBOGT", 1) != 0;
 
+            bool bAlwaysDisplayHealthOnReticle = iniReader.ReadInteger("MISC", "AlwaysDisplayHealthOnReticle", 0) != 0;
+
             //fix for zoom flag in tbogt
             if (nAimingZoomFix)
             {
@@ -514,6 +516,46 @@ public:
                     injector::MakeNOP(pattern.get_first(0), 25, true);
                 }
             }
+
+            // Always display the ped health on the reticle with free-aim while on foot, used to be a gamepad + multiplayer only feature (PC is always free-aim unless it's melee combat).
+            if (bAlwaysDisplayHealthOnReticle)
+            {
+                auto pattern = hook::pattern("80 3D ? ? ? ? ? 75 64 A1 ? ? ? ? 8B 0C 85");
+                if (!pattern.empty())
+                {
+                    static auto loc_5C8E93 = (uintptr_t)pattern.get_first(0);
+
+                    pattern = hook::pattern("80 BB ? ? ? ? ? 74 61 56 57 E8");
+                    struct ReticleHealthHook
+                    {
+                        void operator()(injector::reg_pack& regs)
+                        {
+                            if (!(*(uint8_t*)(regs.ebx + 12941)) || !(*(uint8_t*)(regs.ebx + 12940)))
+                                *(uintptr_t*)(regs.esp - 4) = loc_5C8E93;
+                        }
+                    }; injector::MakeInline<ReticleHealthHook>(pattern.get_first(0), pattern.get_first(9));
+
+                    pattern = hook::pattern("75 0C 38 83 ? ? ? ? 0F 84");
+                    injector::WriteMemory<uint8_t>(pattern.get_first(0), 0xEB, true);
+                }
+                else
+                {
+                    static auto loc_5C8E93 = (uintptr_t)hook::get_pattern("80 3D ? ? ? ? ? 75 6A A1 ? ? ? ? 8B 04 85");
+
+                    pattern = hook::pattern("80 B9 ? ? ? ? ? 74 6D 56 57 E8");
+                    struct ReticleHealthHook
+                    {
+                        void operator()(injector::reg_pack& regs)
+                        {
+                            if (!(*(uint8_t*)(regs.ecx + 12941)) || !(*(uint8_t*)(regs.ecx + 12940)))
+                                *(uintptr_t*)(regs.esp - 4) = loc_5C8E93;
+                        }
+                    }; injector::MakeInline<ReticleHealthHook>(pattern.get_first(0), pattern.get_first(9));
+
+                    pattern = hook::pattern("75 0C 38 86 ? ? ? ? 0F 84");
+                    injector::WriteMemory<uint8_t>(pattern.get_first(0), 0xEB, true);
+                }
+            }
         };
     }
 } Fixes;