From 0300861b75f3432ec91a300aa88f1753c16991df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bartosz=20Kurczy=C5=84ski?= <damned1@interia.pl>
Date: Mon, 16 Dec 2024 20:08:12 +0100
Subject: [PATCH] Fix APC/BIGAPC wheels when player wasted equivalent cop car
 in previous race

---
 src/DETHRACE/common/loading.c  |  8 ++++++++
 src/DETHRACE/common/structur.c | 26 ++++++++++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/src/DETHRACE/common/loading.c b/src/DETHRACE/common/loading.c
index bc9d42db..78a39b68 100644
--- a/src/DETHRACE/common/loading.c
+++ b/src/DETHRACE/common/loading.c
@@ -1745,8 +1745,16 @@ void LoadCar(char* pCar_name, tDriver pDriver, tCar_spec* pCar_spec, int pOwner,
     LOG_TRACE("(\"%s\", %d, %p, %d, \"%s\", %p)", pCar_name, pDriver, pCar_spec, pOwner, pDriver_name, pStorage_space);
 
     if (pDriver == eDriver_local_human) {
+#if defined(DETHRACE_FIX_BUGS)
+        // Player's APC/BIGAPC wheels got stuck if the equivalent cop car was wasted in previous race
+        if (strcmp(gProgram_state.car_name, pCar_name) == 0 &&
+            strcmp(gProgram_state.car_name, "APC.TXT") != 0 &&
+            strcmp(gProgram_state.car_name, "BIGAPC.TXT") != 0)
+            return;
+#else
         if (strcmp(gProgram_state.car_name, pCar_name) == 0)
             return;
+#endif
         if (gProgram_state.car_name[0] != '\0') {
             DisposeCar(&gProgram_state.current_car, gProgram_state.current_car.index);
             ClearOutStorageSpace(&gOur_car_storage_space);
diff --git a/src/DETHRACE/common/structur.c b/src/DETHRACE/common/structur.c
index 75df0232..303dad99 100644
--- a/src/DETHRACE/common/structur.c
+++ b/src/DETHRACE/common/structur.c
@@ -480,6 +480,10 @@ void DoGame(void) {
     int second_select_race;
     int first_summary_done;
     int i;
+#if defined(DETHRACE_FIX_BUGS)
+    // Player's APC/BIGAPC wheels got stuck if the equivalent cop car was wasted in previous race
+    int power_up_levels[3];
+#endif
     LOG_TRACE("()");
 
     gAbandon_game = 0;
@@ -523,6 +527,28 @@ void DoGame(void) {
                     SwapNetCarsLoad();
                 }
             } else {
+#if defined(DETHRACE_FIX_BUGS)
+                // Player's APC/BIGAPC wheels got stuck if the equivalent cop car was wasted in previous race
+                if(strcmp(gProgram_state.car_name, "APC.TXT") == 0 ||
+                   strcmp(gProgram_state.car_name, "BIGAPC.TXT") == 0) {
+                    AboutToLoadFirstCar();
+                    SwitchToRealResolution();
+                    for (i = 0; i < COUNT_OF(power_up_levels); i++) {
+                        power_up_levels[i] = gProgram_state.current_car.power_up_levels[i];
+                    }
+                    LoadCar(gOpponents[gProgram_state.cars_available[gCurrent_car_index]].car_file_name,
+                        eDriver_local_human,
+                        &gProgram_state.current_car,
+                        gProgram_state.cars_available[gCurrent_car_index],
+                        gProgram_state.player_name[gProgram_state.frank_or_anniness],
+                        &gOur_car_storage_space);
+                    for (i = 0; i < COUNT_OF(power_up_levels); i++) {
+                        gProgram_state.current_car.power_up_levels[i] = power_up_levels[i];
+                    }
+                    SwitchToLoresMode();
+                    SetCarStorageTexturingLevel(&gOur_car_storage_space, GetCarTexturingLevel(), eCTL_full);
+                }
+#endif                    
                 LoadOpponentsCars(&gCurrent_race);
             }
             PrintMemoryDump(0, "AFTER LOADING OPPONENTS IN");