mirror of
https://github.com/GTAmodding/re3.git
synced 2024-12-25 18:55:40 +00:00
Merge branch 'miami' of github.com:GTAmodding/re3 into miami
This commit is contained in:
commit
e3616c1ce1
3 changed files with 16 additions and 4 deletions
|
@ -2858,9 +2858,11 @@ void CCarCtrl::SteerAICarWithPhysicsFollowPath(CVehicle* pVehicle, float* pSwerv
|
|||
case DRIVINGSTYLE_STOP_FOR_CARS_IGNORE_LIGHTS:
|
||||
speedStyleMultiplier = FindMaximumSpeedForThisCarInTraffic(pVehicle);
|
||||
#ifdef FIX_BUGS
|
||||
if (pVehicle->AutoPilot.m_nCruiseSpeed != 0)
|
||||
#endif
|
||||
if (pVehicle->AutoPilot.GetCruiseSpeed() != 0)
|
||||
speedStyleMultiplier /= pVehicle->AutoPilot.GetCruiseSpeed();
|
||||
#else
|
||||
speedStyleMultiplier /= pVehicle->AutoPilot.m_nCruiseSpeed;
|
||||
#endif
|
||||
break;
|
||||
default:
|
||||
speedStyleMultiplier = 1.0f;
|
||||
|
|
|
@ -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()->DoStuffToGoOnFire();
|
||||
gFireManager.StartFire(FindPlayerPed(), m_pSource, 0.8f, 1);
|
||||
|
|
|
@ -3293,9 +3293,15 @@ CPed::PedAnimStepOutCarCB(CAnimBlendAssociation* animAssoc, void* arg)
|
|||
}
|
||||
|
||||
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))
|
||||
((CAutomobile*)veh)->Damage.SetDoorStatus(DOOR_FRONT_LEFT, DOOR_STATUS_SWINGING);
|
||||
#endif
|
||||
} else {
|
||||
switch (door) {
|
||||
case DOOR_FRONT_LEFT:
|
||||
|
|
Loading…
Reference in a new issue