GTA III/VC: Remove IVRadarScaling position changes (#1638)

These changes assumed the horizontal radar position doesn't scale,
which is now not true with the upcoming SilentPatch.
Therefore, those values caused the radar to move way too far to the right.

For consistency, vertical position changes have been removed too,
so now this option only alters the scaling, true to its name.

Author: CookiePLMonster

includes/GTA/global.h

@@ -26,13 +26,8 @@ uint32_t ReplaceTextShadowWithOutline;
 bool DisableWhiteCrosshairDot;
 float fCustomRadarWidthIV;
 float fCustomRadarHeightIV;
-float fCustomRadarPosXIV;
-float fCustomRadarPosYIV;
 float fCustomRadarRingWidthIV;
 float fCustomRadarRingHeightIV;
-float fCustomRadarRingPosXIV;
-float fCustomRadarRingPosYIV;
-float fCustomRadarRingPosXIV2;
 std::string szSelectedMultisamplingLevels;
 uint32_t SelectedMultisamplingLevels;
 uint32_t* BordersVar1;

source/GTA3.WidescreenFix/dllmain.cpp

@@ -607,35 +607,18 @@ void ApplyIniOptions()
 
     if (bIVRadarScaling)
     {
-        fCustomRadarPosXIV = 40.0f + 31.0f;
-        auto pattern = hook::pattern("D8 05 ? ? ? ? DE C1 D9 19 8B 15 ? ? ? ? 89 14 24");
-        injector::WriteMemory<float>(*pattern.count(1).get(0).get<uint32_t*>(2), fCustomRadarPosXIV, true); //0x4A5075
         fCustomRadarWidthIV = 94.0f - 5.5f;
         pattern = hook::pattern("D8 0D ? ? ? ? DD DA D9 00 D8 CA");
         injector::WriteMemory<float>(*pattern.count(1).get(0).get<uint32_t*>(2), fCustomRadarWidthIV, true); //0x4A505B
 
-        fCustomRadarPosYIV = 116.0f - 7.5f;
-        pattern = hook::pattern("D9 05 ? ? ? ? 89 14 24 D8 CB DA 2C 24 DE C1 DE E1");
-        injector::WriteMemory<float>(*pattern.count(1).get(0).get<uint32_t*>(2), fCustomRadarPosYIV, true); //0x4A50B0
         fCustomRadarHeightIV = 76.0f + 5.0f;
         pattern = hook::pattern("D9 05 ? ? ? ? D8 C9 DD DA D9 40 04 D8 CA");
         injector::WriteMemory<float>(*pattern.count(1).get(0).get<uint32_t*>(2), fCustomRadarHeightIV, true); //0x4A5093
 
-        fCustomRadarRingPosXIV = 34.0f + 31.0f;
-        fCustomRadarRingPosXIV2 = fCustomRadarRingPosXIV + 6.0f;
-        pattern = hook::pattern("FF 35 ? ? ? ? DD D8 E8 ? ? ? ? B9 ? ? ? ? 50");
-        injector::WriteMemory(pattern.count(1).get(0).get<uint32_t>(2), &fCustomRadarRingPosXIV, true); //0x50845F
-        pattern = hook::pattern("D8 05 ? ? ? ? D8 05 ? ? ? ? D9 1C 24 D9 C0 D8 25 ? ? ? ? 50");
-        injector::WriteMemory(pattern.count(1).get(0).get<uint32_t>(2), &fCustomRadarRingPosXIV2, true); //0x508481
-
         fCustomRadarRingWidthIV = 94.0f - 5.5f;
         pattern = hook::pattern("D8 0D ? ? ? ? D8 05 ? ? ? ? D8 05");
         injector::WriteMemory<float>(*pattern.count(1).get(0).get<uint32_t*>(2), fCustomRadarRingWidthIV, true); //0x5FDC70
 
-        fCustomRadarRingPosYIV = 116.0f - 7.5f;
-        pattern = hook::pattern("D9 05 ? ? ? ? D8 CA DA 6C 24 34 DD DA D8 C1");
-        injector::WriteMemory<float>(*pattern.count(1).get(0).get<uint32_t*>(2), fCustomRadarRingPosYIV); //0x508433
-
         fCustomRadarRingHeightIV = 76.0f + 5.0f;
         pattern = hook::pattern("D9 05 ? ? ? ? D8 C9 D9 05 ? ? ? ? D8 CA DA 6C 24 34");
         injector::WriteMemory<float>(*pattern.count(1).get(0).get<uint32_t*>(2), fCustomRadarRingHeightIV, true); //0x5FDC68

source/GTAVC.WidescreenFix/dllmain.cpp

@@ -677,43 +677,18 @@ void ApplyIniOptions()
 
     if (bIVRadarScaling)
     {
-        fCustomRadarPosXIV = 40.0f + 31.0f;
-        auto pattern = hook::pattern("D8 05 ? ? ? ? DE C1 D9 5C 24 28");
-        injector::WriteMemory<float>(*pattern.count(1).get(0).get<uint32_t*>(2), fCustomRadarPosXIV, true); //0x68FD2C
-        static float f40 = 40.0f;
-        pattern = hook::pattern("83 EC 50 DD D9 D9 05 ? ? ? ? D8 C9");
-        injector::WriteMemory(pattern.count(1).get(0).get<uint32_t>(7), &f40, true); //0x4C2996
-        injector::WriteMemory(pattern.count(1).get(0).get<uint32_t>(60), &f40, true); //0x4C29CB
-
         fCustomRadarWidthIV = 94.0f - 5.5f;
         pattern = hook::pattern("D8 0D ? ? ? ? DD D9 D9 C2 D8 C9 D8 0D");
         injector::WriteMemory<float>(*pattern.count(1).get(0).get<uint32_t*>(2), fCustomRadarWidthIV, true); //0x68FD24
 
-        fCustomRadarPosYIV = 116.0f - 7.5f;
-        pattern = hook::pattern("D9 05 ? ? ? ? D8 CB DA 2C 24 DE C1");
-        injector::WriteMemory<float>(*pattern.count(1).get(0).get<uint32_t*>(2), fCustomRadarPosYIV, true); //0x68FD34
         fCustomRadarHeightIV = 76.0f + 5.0f;
         pattern = hook::pattern("D9 05 ? ? ? ? D8 C9 DD DB D9 C1 D8 CB");
         injector::WriteMemory<float>(*pattern.count(1).get(0).get<uint32_t*>(2), fCustomRadarHeightIV, true); //0x68FD30
 
-        fCustomRadarRingPosXIV = 34.0f + 31.0f;
-        fCustomRadarRingPosXIV2 = fCustomRadarRingPosXIV + 6.0f;
-        pattern = hook::pattern("C7 84 24 80 04 00 00 00 00 08 42");
-        injector::WriteMemory<float>(pattern.count(1).get(0).get<uint32_t>(7), fCustomRadarRingPosXIV, true); //0x55A956
-        pattern = hook::pattern("C7 84 24 A0 04 00 00 00 00 08 42");
-        injector::WriteMemory<float>(pattern.count(1).get(0).get<uint32_t>(7), fCustomRadarRingPosXIV, true); //0x55AA94
-        pattern = hook::pattern("D8 05 ? ? ? ? D8 05 ? ? ? ? D9 9C 24");
-        injector::WriteMemory(pattern.count(2).get(0).get<uint32_t>(2), &fCustomRadarRingPosXIV2, true); //0x55A9AC + 0x2
-        injector::WriteMemory(pattern.count(2).get(1).get<uint32_t>(2), &fCustomRadarRingPosXIV2, true); //0x55AAE5 + 0x2
-
         fCustomRadarRingWidthIV = 94.0f - 5.5f;
         pattern = hook::pattern("D8 0D ? ? ? ? D8 05 ? ? ? ? D8 05 ? ? ? ? D9 9C 24 98 04 00 00");
         injector::WriteMemory<float>(*pattern.count(1).get(0).get<uint32_t*>(2), fCustomRadarRingWidthIV, true); //0x697C1C
 
-        fCustomRadarRingPosYIV = 116.0f - 7.5f;
-        pattern = hook::pattern("D9 05 ? ? ? ? D8 CA DA 6C 24 74 51");
-        injector::WriteMemory<float>(*pattern.count(1).get(0).get<uint32_t*>(2), fCustomRadarRingPosYIV, true); //0x697C18
-
         fCustomRadarRingHeightIV = 76.0f + 5.0f;
         pattern = hook::pattern("D9 05 ? ? ? ? D8 CA D8 C1");
         injector::WriteMemory<float>(*pattern.count(1).get(0).get<uint32_t*>(2), fCustomRadarRingHeightIV, true); //0x697C20