summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/collision/Collision.cpp3
-rw-r--r--src/core/Pools.cpp2
-rw-r--r--src/core/Streaming.cpp6
-rw-r--r--src/objects/Stinger.cpp3
-rw-r--r--src/peds/Population.cpp7
-rw-r--r--src/vehicles/Automobile.cpp2
-rw-r--r--src/vehicles/Bike.cpp2
7 files changed, 16 insertions, 9 deletions
diff --git a/src/collision/Collision.cpp b/src/collision/Collision.cpp
index 50c22e32..0ffcd09a 100644
--- a/src/collision/Collision.cpp
+++ b/src/collision/Collision.cpp
@@ -144,11 +144,10 @@ CCollision::SortOutCollisionAfterLoad(void)
void
CCollision::LoadCollisionScreen(eLevelName level)
{
- static Const char *levelNames[4] = {
+ static Const char *levelNames[] = {
"",
"IND_ZON",
"COM_ZON",
- "SUB_ZON"
};
// Why twice?
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;
}
diff --git a/src/objects/Stinger.cpp b/src/objects/Stinger.cpp
index 848a7cf7..41040d4a 100644
--- a/src/objects/Stinger.cpp
+++ b/src/objects/Stinger.cpp
@@ -234,5 +234,8 @@ CStinger::Process()
Remove();
break;
}
+#ifdef FIX_BUGS
+ if (bIsDeployed)
+#endif
CheckForBurstTyres();
} \ No newline at end of file
diff --git a/src/peds/Population.cpp b/src/peds/Population.cpp
index 5603e2c6..d7a545d8 100644
--- a/src/peds/Population.cpp
+++ b/src/peds/Population.cpp
@@ -911,10 +911,9 @@ CPopulation::MoveCarsAndPedsOutOfAbandonedZones()
void
CPopulation::ConvertAllObjectsToDummyObjects()
{
- int poolSize = CPools::GetObjectPool()->GetSize();
- for (int poolIndex = poolSize - 1; poolIndex >= 0; poolIndex--) {
-
- CObject *obj = CPools::GetObjectPool()->GetSlot(poolIndex);
+ uint32 i = CPools::GetObjectPool()->GetSize();
+ while(i--) {
+ CObject *obj = CPools::GetObjectPool()->GetSlot(i);
if (obj) {
if (obj->CanBeDeleted())
ConvertToDummyObject(obj);
diff --git a/src/vehicles/Automobile.cpp b/src/vehicles/Automobile.cpp
index 06dc1b54..041db625 100644
--- a/src/vehicles/Automobile.cpp
+++ b/src/vehicles/Automobile.cpp
@@ -4980,7 +4980,7 @@ CAutomobile::GetHeightAboveRoad(void)
void
CAutomobile::PlayCarHorn(void)
{
- int r;
+ uint32 r;
if (IsAlarmOn() || m_nCarHornTimer != 0)
return;
diff --git a/src/vehicles/Bike.cpp b/src/vehicles/Bike.cpp
index 3e4c3a31..0b6d4e3a 100644
--- a/src/vehicles/Bike.cpp
+++ b/src/vehicles/Bike.cpp
@@ -2546,7 +2546,7 @@ CBike::GetHeightAboveRoad(void)
void
CBike::PlayCarHorn(void)
{
- int r;
+ uint32 r;
if (IsAlarmOn() || m_nCarHornTimer != 0)
return;