mirror of
https://gitlab.com/GaryOderNichts/re3-wiiu.git
synced 2024-11-27 11:34:14 +01:00
Fixes
This commit is contained in:
parent
c5303c2ea4
commit
a311f643f9
@ -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?
|
||||
|
@ -105,7 +105,7 @@ CPools::CheckPoolsEmpty()
|
||||
printf("pools have been cleared\n");
|
||||
}
|
||||
|
||||
|
||||
// Thankfully unused, it would break the game!
|
||||
void
|
||||
CPools::MakeSureSlotInObjectPoolIsEmpty(int32 slot)
|
||||
{
|
||||
|
@ -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;
|
||||
}
|
||||
|
@ -234,5 +234,8 @@ CStinger::Process()
|
||||
Remove();
|
||||
break;
|
||||
}
|
||||
#ifdef FIX_BUGS
|
||||
if (bIsDeployed)
|
||||
#endif
|
||||
CheckForBurstTyres();
|
||||
}
|
@ -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);
|
||||
|
@ -4980,7 +4980,7 @@ CAutomobile::GetHeightAboveRoad(void)
|
||||
void
|
||||
CAutomobile::PlayCarHorn(void)
|
||||
{
|
||||
int r;
|
||||
uint32 r;
|
||||
|
||||
if (IsAlarmOn() || m_nCarHornTimer != 0)
|
||||
return;
|
||||
|
@ -2546,7 +2546,7 @@ CBike::GetHeightAboveRoad(void)
|
||||
void
|
||||
CBike::PlayCarHorn(void)
|
||||
{
|
||||
int r;
|
||||
uint32 r;
|
||||
|
||||
if (IsAlarmOn() || m_nCarHornTimer != 0)
|
||||
return;
|
||||
|
Loading…
Reference in New Issue
Block a user