summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorerorcun <erorcunerorcun@hotmail.com.tr>2021-02-28 13:50:51 +0100
committererorcun <erorcunerorcun@hotmail.com.tr>2021-02-28 13:50:51 +0100
commita311f643f9a0a7377e27f49b18739fe5de5a6291 (patch)
tree97b5e9deb2d81827e8e229d9e64bfce167132ea0 /src/core
parentFix muzzleflash rotation (diff)
downloadre3-a311f643f9a0a7377e27f49b18739fe5de5a6291.tar
re3-a311f643f9a0a7377e27f49b18739fe5de5a6291.tar.gz
re3-a311f643f9a0a7377e27f49b18739fe5de5a6291.tar.bz2
re3-a311f643f9a0a7377e27f49b18739fe5de5a6291.tar.lz
re3-a311f643f9a0a7377e27f49b18739fe5de5a6291.tar.xz
re3-a311f643f9a0a7377e27f49b18739fe5de5a6291.tar.zst
re3-a311f643f9a0a7377e27f49b18739fe5de5a6291.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/Pools.cpp2
-rw-r--r--src/core/Streaming.cpp6
2 files changed, 7 insertions, 1 deletions
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;
}