From a311f643f9a0a7377e27f49b18739fe5de5a6291 Mon Sep 17 00:00:00 2001 From: erorcun Date: Sun, 28 Feb 2021 15:50:51 +0300 Subject: Fixes --- src/core/Pools.cpp | 2 +- src/core/Streaming.cpp | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'src/core') diff --git a/src/core/Pools.cpp b/src/core/Pools.cpp index bf35f8ef..d824d498 100644 --- a/src/core/Pools.cpp +++ b/src/core/Pools.cpp @@ -105,7 +105,7 @@ CPools::CheckPoolsEmpty() printf("pools have been cleared\n"); } - +// Thankfully unused, it would break the game! void CPools::MakeSureSlotInObjectPoolIsEmpty(int32 slot) { diff --git a/src/core/Streaming.cpp b/src/core/Streaming.cpp index b28a99fc..ee286278 100644 --- a/src/core/Streaming.cpp +++ b/src/core/Streaming.cpp @@ -1724,7 +1724,13 @@ CStreaming::StreamVehiclesAndPeds(void) for(i = 0; i < CCarCtrl::TOTAL_CUSTOM_CLASSES; i++){ if(CCarCtrl::NumRequestsOfCarRating[i] > maxReq && ((i == 0 && zone.carThreshold[0] != 0) || +#ifdef FIX_BUGS + (i < CCarCtrl::NUM_CAR_CLASSES && zone.carThreshold[i] != zone.carThreshold[i-1]) || + (i == CCarCtrl::NUM_CAR_CLASSES && zone.boatThreshold[i - CCarCtrl::NUM_CAR_CLASSES] != 0) || + (i > CCarCtrl::NUM_CAR_CLASSES && i < CCarCtrl::TOTAL_CUSTOM_CLASSES && zone.boatThreshold[i - CCarCtrl::NUM_CAR_CLASSES] != zone.boatThreshold[i - CCarCtrl::NUM_CAR_CLASSES - 1]))) { +#else (i != 0 && zone.carThreshold[i] != zone.carThreshold[i-1]))) { +#endif maxReq = CCarCtrl::NumRequestsOfCarRating[i]; mostRequestedRating = i; } -- cgit v1.2.3