mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2024-12-25 07:25:41 +00:00
Code Issues Projects Releases Wiki Activity

Fixes

Browse source
This commit is contained in:
erorcun 2021-02-28 15:50:51 +03:00
parent c5303c2ea4
commit a311f643f9
7 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/collision/Collision.cpp
View file

@ -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?

2
src/core/Pools.cpp
View file

@ -105,7 +105,7 @@ CPools::CheckPoolsEmpty()
printf("pools have been cleared\n");
}
// Thankfully unused, it would break the game!
void
CPools::MakeSureSlotInObjectPoolIsEmpty(int32 slot)
{

6
src/core/Streaming.cpp
View file

@ -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;
}

3
src/objects/Stinger.cpp
View file

@ -234,5 +234,8 @@ CStinger::Process()
Remove();
break;
}
#ifdef FIX_BUGS
if (bIsDeployed)
#endif
CheckForBurstTyres();
}

7
src/peds/Population.cpp
View file

@ -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);

2
src/vehicles/Automobile.cpp
View file

@ -4980,7 +4980,7 @@ CAutomobile::GetHeightAboveRoad(void)
void
CAutomobile::PlayCarHorn(void)
{
int r;
uint32 r;
if (IsAlarmOn() || m_nCarHornTimer != 0)
return;

2
src/vehicles/Bike.cpp
View file

@ -2546,7 +2546,7 @@ CBike::GetHeightAboveRoad(void)
void
CBike::PlayCarHorn(void)
{
int r;
uint32 r;
if (IsAlarmOn() || m_nCarHornTimer != 0)
return;