Mirrors/SilentPatch
1
0
Fork 0
mirror of https://github.com/CookiePLMonster/SilentPatch.git synced 2024-11-21 21:12:29 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

SA: Fix the driving school cones fix so it doesn't leave cones from "Cone Coil" and "Burn and Lap" behind

Browse Source 
Fixes #62
This commit is contained in:
Silent 2024-10-31 23:27:53 +01:00
parent 3017790d44
commit 2f79eb1c8f
No known key found for this signature in database
GPG Key ID: AE53149BB0C45AF1
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG-SA.md
View File

@ -102,6 +102,7 @@ All the remaining, non-critical fixes.
* ➕ The boundaries of the cursor on the Map screen, and the cursor itself now scale to resolution correctly (contributed by **Wesser**). * ➕ The boundaries of the cursor on the Map screen, and the cursor itself now scale to resolution correctly (contributed by **Wesser**).
* ➕ The inner padding of the text boxes with a background now scales to resolution correctly (contributed by **Wesser**). * ➕ The inner padding of the text boxes with a background now scales to resolution correctly (contributed by **Wesser**).
* ➕ Nitrous will no longer regenerate faster when reversing the car (contributed by **Wesser**). * ➕ Nitrous will no longer regenerate faster when reversing the car (contributed by **Wesser**).
* ➕ Hydra's jet thrusters no longer randomly fail to appear (contributed by **B1ack_Wh1te**).
* Detached vehicle parts will now keep the same color and lighting as the vehicle they came from. * Detached vehicle parts will now keep the same color and lighting as the vehicle they came from.
* Detached vehicle parts are now rendered from both sides. * Detached vehicle parts are now rendered from both sides.
* Resolved single-pixel wide seams showing on the Map screen with Anti-Aliasing enabled. * Resolved single-pixel wide seams showing on the Map screen with Anti-Aliasing enabled.

16
SilentPatchSA/SilentPatchSA.cpp
View File

@ -603,7 +603,7 @@ static hook::pattern MakeScriptPattern(bool isMission, std::string_view bytes)
begin = uintptr_t(ScriptSpace); begin = uintptr_t(ScriptSpace);
end = begin + ScriptFileSize; end = begin + ScriptFileSize;
} }
return hook::make_range_pattern(begin, end, bytes).count_hint(100); return hook::make_range_pattern(begin, end, bytes);
} }
static void MountainCloudBoysFix() static void MountainCloudBoysFix()
@ -631,7 +631,10 @@ static void SupplyLinesFix( bool isBeefyBaron )
static void DrivingSchoolConesFix() static void DrivingSchoolConesFix()
{ {
auto pattern = MakeScriptPattern(true, "04 00 02 20 03 04 00 D6 00 04 00 1A 00 04 2E 02 20 03 4D 00 01 60 75 FF FF BE 00 08 01 07 24 03 20 03 2E 80 08 00 02 20 03 04 01"); auto pattern = MakeScriptPattern(true, "04 00 02 20 03 04 00 D6 00 04 00 1A 00 04 2E 02 20 03 4D 00 01 60 75 FF FF BE 00 08 01 07 24 03 20 03 2E 80 08 00 02 20 03 04 01");
if (pattern.size() == 1) // Only destroy as many cones as were created auto coneCoilConeCount = MakeScriptPattern(true, "1A 00 04 17 02 20 03");
auto burnAndLapConeCount = MakeScriptPattern(true, "1A 00 04 23 02 20 03");
// Only destroy as many cones as were created, and correct trafficcone_counter for "Cone Coil" and "Burn and Lap"
if (pattern.size() == 1 && coneCoilConeCount.size() == 1 && burnAndLapConeCount.size() == 1)
{ {
const uint8_t gotoSkipAssignment[] = { 0x02, 0x00, 0x01, 0x8B, 0x75, 0xFF, 0xFF }; const uint8_t gotoSkipAssignment[] = { 0x02, 0x00, 0x01, 0x8B, 0x75, 0xFF, 0xFF };
memcpy(pattern.get(0).get<void>(0), gotoSkipAssignment, sizeof(gotoSkipAssignment)); memcpy(pattern.get(0).get<void>(0), gotoSkipAssignment, sizeof(gotoSkipAssignment));
@ -646,6 +649,15 @@ static void DrivingSchoolConesFix()
// Also set trafficcone_counter to 0 so the first destruction doesn't happen // Also set trafficcone_counter to 0 so the first destruction doesn't happen
int32_t* trafficcone_counter = reinterpret_cast<int32_t*>(ScriptSpace+800); int32_t* trafficcone_counter = reinterpret_cast<int32_t*>(ScriptSpace+800);
*trafficcone_counter = 0; *trafficcone_counter = 0;
// Correct the final trafficcone_counter in Cone Coil
// 23 -> 30
*coneCoilConeCount.get(0).get<int8_t>(3) = 30;
// Correct the final trafficcone_counter in Burn and Lap
// 35 -> 42
*burnAndLapConeCount.get(0).get<int8_t>(3) = 42;
} }
} }