a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-11-05 10:25:54 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'miami' of github.com:GTAmodding/re3 into miami

Browse source
This commit is contained in:
aap 2020-12-13 12:53:27 +01:00
parent 35cac6b93b 6d61f9d2e1
commit e3616c1ce1
3 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/control/CarCtrl.cpp
View file

@ -2858,9 +2858,11 @@ void CCarCtrl::SteerAICarWithPhysicsFollowPath(CVehicle* pVehicle, float* pSwerv
case DRIVINGSTYLE_STOP_FOR_CARS_IGNORE_LIGHTS: case DRIVINGSTYLE_STOP_FOR_CARS_IGNORE_LIGHTS:
speedStyleMultiplier = FindMaximumSpeedForThisCarInTraffic(pVehicle); speedStyleMultiplier = FindMaximumSpeedForThisCarInTraffic(pVehicle);
#ifdef FIX_BUGS #ifdef FIX_BUGS
if (pVehicle->AutoPilot.m_nCruiseSpeed != 0) if (pVehicle->AutoPilot.GetCruiseSpeed() != 0)
speedStyleMultiplier /= pVehicle->AutoPilot.GetCruiseSpeed();
#else
speedStyleMultiplier /= pVehicle->AutoPilot.m_nCruiseSpeed;
#endif #endif
speedStyleMultiplier /= pVehicle->AutoPilot.m_nCruiseSpeed;
break; break;
default: default:
speedStyleMultiplier = 1.0f; speedStyleMultiplier = 1.0f;

6
src/core/Fire.cpp
View file

@ -107,7 +107,11 @@ CFire::ProcessFire(void)
} }
} }
} }
if (!FindPlayerVehicle() && !FindPlayerPed()->m_pFire && !(FindPlayerPed()->bFireProof) if (!FindPlayerVehicle() &&
#ifdef FIX_BUGS
FindPlayerPed() &&
#endif
!FindPlayerPed()->m_pFire && !(FindPlayerPed()->bFireProof)
&& ((FindPlayerPed()->GetPosition() - m_vecPos).MagnitudeSqr() < 2.0f)) { && ((FindPlayerPed()->GetPosition() - m_vecPos).MagnitudeSqr() < 2.0f)) {
FindPlayerPed()->DoStuffToGoOnFire(); FindPlayerPed()->DoStuffToGoOnFire();
gFireManager.StartFire(FindPlayerPed(), m_pSource, 0.8f, 1); gFireManager.StartFire(FindPlayerPed(), m_pSource, 0.8f, 1);

8
src/peds/PedAI.cpp
View file

@ -3293,9 +3293,15 @@ CPed::PedAnimStepOutCarCB(CAnimBlendAssociation* animAssoc, void* arg)
} }
if (ped->bFleeAfterExitingCar || ped->bGonnaKillTheCarJacker) { if (ped->bFleeAfterExitingCar || ped->bGonnaKillTheCarJacker) {
// POTENTIAL BUG? Why DOOR_FRONT_LEFT instead of door variable? or vice versa? #ifdef FIX_BUGS
if (!veh->IsDoorMissing(door))
((CAutomobile*)veh)->Damage.SetDoorStatus(door, DOOR_STATUS_SWINGING);
PedSetOutCarCB(nil, ped);
return;
#else
if (!veh->IsDoorMissing(door)) if (!veh->IsDoorMissing(door))
((CAutomobile*)veh)->Damage.SetDoorStatus(DOOR_FRONT_LEFT, DOOR_STATUS_SWINGING); ((CAutomobile*)veh)->Damage.SetDoorStatus(DOOR_FRONT_LEFT, DOOR_STATUS_SWINGING);
#endif
} else { } else {
switch (door) { switch (door) {
case DOOR_FRONT_LEFT: case DOOR_FRONT_LEFT: