PreCE fixes (#1102)

* PreCE fixes

* Use parameter names from natives.ixx

* Restore old code

Author: RecklessGlue540

source/fixes.ixx

@@ -935,7 +935,7 @@ public:
                 hbCOMPARE_STRING.fun = NativeOverride::Register(Natives::NativeHashes::COMPARE_STRING, NATIVE_COMPARE_STRING, "E8 ? ? ? ? ? ? ? ? ? 83 C4 ? 89 ? 5E C3", 30);
             }
 
-            // TLAD Marta Full of Grace's crash https://github.com/GTAmodding/GTAIV-Issues-List/issues/235
+            // TLAD Marta Full of Grace's crash (https://github.com/GTAmodding/GTAIV-Issues-List/issues/235)
             {
                 auto pattern = find_pattern("F6 80 ? ? ? ? ? 74 ? 8B 80 ? ? ? ? 56");
                 if (!pattern.empty())
@@ -961,14 +961,14 @@ public:
                 pattern = find_pattern("E8 ? ? ? ? 85 C0 0F 84 ? ? ? ? 8B 4C 24 ? 3B F9", "E8 ? ? ? ? 85 C0 0F 84 ? ? ? ? 3B F7");
                 hbIsSphereVisible.fun = injector::MakeCALL(pattern.get_first(0), DrawWaterIsSphereVisible, true).get();
 
-                pattern = find_pattern("E8 ? ? ? ? 8B D0 8B B4 BA", "8B B4 00 ? ? ? ? 03 C0 8B 80 ? ? ? ? 03 C6 3B F0 0F 83 ? ? ? ? 8D 64 24");
+                pattern = find_pattern("E8 ? ? ? ? 8B D0 8B B4 BA", "E8 ? ? ? ? 8B BC B0 ? ? ? ? 8B 94 B0");
                 static auto RenderWaterHook = safetyhook::create_mid(pattern.get_first(0), [](SafetyHookContext& regs)
                 {
                     bAnyVisibleNearbyWaterOnScreen = false;
                     WaterQuadsCount = 0;
                 });
 
-                pattern = find_pattern("0F B7 0C 72 C1 E1 ? 0F BF 81", "0F B7 04 55 ? ? ? ? C1 E0 ? 0F BF 88");
+                pattern = find_pattern("0F B7 0C 72 C1 E1 ? 0F BF 81", "0F B7 04 78 C1 E0 04 0F BF 88 ? ? ? ? 8B 14 CD ? ? ? ? 0F BF 88 ? ? ? ? 03 C9");
                 static auto RenderWaterCounterHook = safetyhook::create_mid(pattern.get_first(0), [](SafetyHookContext& regs)
                 {
                     WaterQuadsCount++;
@@ -986,36 +986,36 @@ public:
                     bAnyVisibleNearbyLightOnScreen = false;
                 });
 
-                pattern = find_pattern("A8 ? 0F 84 ? ? ? ? 8B C8");
+                pattern = hook::pattern("A8 ? 0F 84 ? ? ? ? 8B C8");
                 static auto loc_927DE0 = resolve_next_displacement(pattern.get_first(0)).value();
                 injector::MakeNOP(pattern.get_first(2), 6);
                 static auto LightCounterHook = safetyhook::create_mid(pattern.get_first(0), [](SafetyHookContext& regs)
                 {
-                    static auto extraNightShadows = FusionFixSettings.GetRef("PREF_EXTRANIGHTSHADOWS");
-                    if (extraNightShadows->get())
+                    static auto ExtraNightShadows = FusionFixSettings.GetRef("PREF_EXTRANIGHTSHADOWS");
+                    if (ExtraNightShadows->get())
                     {
                         if ((regs.eax & 6) != 0)
                         {
                             if (Natives::IsInteriorScene())
                             {
-                                return; //flicker - always in interiors
+                                return; // Flicker - Always in interiors
                             }
 
                             if (!bAnyVisibleNearbyWaterOnScreen)
                             {
-                                return; //flicker - no water on screen
+                                return; // Flicker - No water on screen
                             }
                             else if (bAnyVisibleNearbyLightOnScreen)
                             {
-                                return; //flicker - water and lights
+                                return; // Flicker - Water and lights
                             }
                         }
                     }
                     else
                     {
                         if ((regs.eax & 6) != 0 && Natives::IsInteriorScene())
                         {
-                            return; //flicker
+                            return; // Flicker
                         }
                     }
 

source/frameratevigilante.ixx

@@ -206,10 +206,17 @@ void __cdecl NATIVE_SET_CAM_FOV(int cam, float targetFOV)
 }
 
 injector::hook_back<decltype(&Natives::SlideObject)> hbSLIDE_OBJECT;
-bool __cdecl NATIVE_SLIDE_OBJECT(Object object, float toX, float toY, float toZ, float speedX, float speedY, float speedZ, char collision)
+bool __cdecl NATIVE_SLIDE_OBJECT_1(Object object, float x, float y, float z, float xs, float ys, float zs, bool flag)
 {
     float delta = *CTimer::fTimeStep * 30.0f;
-    return hbSLIDE_OBJECT.fun(object, toX, toY, toZ, speedX * delta, speedY * delta, speedZ * delta, collision);
+    return hbSLIDE_OBJECT.fun(object, x, y, z, xs * delta, ys * delta, zs * delta, flag);
+}
+
+SafetyHookInline shNATIVE_SLIDE_OBJECT{};
+bool __cdecl NATIVE_SLIDE_OBJECT_2(Object object, float x, float y, float z, float xs, float ys, float zs, bool flag)
+{
+    float delta = *CTimer::fTimeStep * 30.0f;
+    return shNATIVE_SLIDE_OBJECT.unsafe_ccall<bool>(object, x, y, z, xs * delta, ys * delta, zs * delta, flag);
 }
 
 class FramerateVigilante
@@ -356,9 +363,12 @@ public:
 
             // Natives
             hbSET_CAM_FOV.fun = NativeOverride::Register(Natives::NativeHashes::SET_CAM_FOV, NATIVE_SET_CAM_FOV, "E8 ? ? ? ? 83 C4 08 C3", 30);
-            hbSLIDE_OBJECT.fun = NativeOverride::Register(Natives::NativeHashes::SLIDE_OBJECT, NATIVE_SLIDE_OBJECT, "E8 ? ? ? ? 0F B6 C8", 107);
+            hbSLIDE_OBJECT.fun = NativeOverride::Register(Natives::NativeHashes::SLIDE_OBJECT, NATIVE_SLIDE_OBJECT_1, "E8 ? ? ? ? 0F B6 C8", 107);
             if (!hbSLIDE_OBJECT.fun)
-                hbSLIDE_OBJECT.fun = NativeOverride::Register(Natives::NativeHashes::SLIDE_OBJECT, NATIVE_SLIDE_OBJECT, "E8 ? ? ? ? 83 C4 ? C3", 30);
+            {
+                pattern = hook::pattern("55 8B EC 83 E4 F0 8B 45 08 8B 0D ? ? ? ? 81 EC ? ? ? ? 56 50");
+                shNATIVE_SLIDE_OBJECT = safetyhook::create_inline(pattern.get_first(0), NATIVE_SLIDE_OBJECT_2);
+            }
 
             // CCamFollowVehicle
             pattern = find_pattern("77 ? 0F 28 C2 F3 0F 5C 8F", "77 ? 0F 28 D3 F3 0F 10 8E");