mirror of
https://git.rip/DMCA_FUCKER/re3.git
synced 2024-12-24 13:00:00 +00:00
Merge remote-tracking branch 'upstream/miami' into miami
This commit is contained in:
commit
b498ad800c
|
@ -925,7 +925,7 @@ CCarCtrl::RemoveCarsIfThePoolGetsFull(void)
|
||||||
if (CPools::GetVehiclePool()->GetNoOfFreeSpaces() >= 8)
|
if (CPools::GetVehiclePool()->GetNoOfFreeSpaces() >= 8)
|
||||||
return;
|
return;
|
||||||
int i = CPools::GetVehiclePool()->GetSize();
|
int i = CPools::GetVehiclePool()->GetSize();
|
||||||
float md = 999999.9f;
|
float md = 10000000.f;
|
||||||
CVehicle* pClosestVehicle = nil;
|
CVehicle* pClosestVehicle = nil;
|
||||||
while (i--) {
|
while (i--) {
|
||||||
CVehicle* pVehicle = CPools::GetVehiclePool()->GetSlot(i);
|
CVehicle* pVehicle = CPools::GetVehiclePool()->GetSlot(i);
|
||||||
|
@ -2424,6 +2424,12 @@ void CCarCtrl::SteerAICarWithPhysics_OnlyMission(CVehicle* pVehicle, float* pSwe
|
||||||
case MISSION_GOTOCOORDS_ACCURATE:
|
case MISSION_GOTOCOORDS_ACCURATE:
|
||||||
case MISSION_RAMCAR_FARAWAY:
|
case MISSION_RAMCAR_FARAWAY:
|
||||||
case MISSION_BLOCKCAR_FARAWAY:
|
case MISSION_BLOCKCAR_FARAWAY:
|
||||||
|
if (pVehicle->AutoPilot.m_bIgnorePathfinding) {
|
||||||
|
*pSwerve = 0.0f;
|
||||||
|
*pAccel = 1.0f;
|
||||||
|
*pBrake = 0.0f;
|
||||||
|
*pHandbrake = false;
|
||||||
|
}else
|
||||||
SteerAICarWithPhysicsFollowPath(pVehicle, pSwerve, pAccel, pBrake, pHandbrake);
|
SteerAICarWithPhysicsFollowPath(pVehicle, pSwerve, pAccel, pBrake, pHandbrake);
|
||||||
return;
|
return;
|
||||||
case MISSION_RAMPLAYER_CLOSE:
|
case MISSION_RAMPLAYER_CLOSE:
|
||||||
|
@ -3050,6 +3056,7 @@ bool CCarCtrl::JoinCarWithRoadSystemGotoCoors(CVehicle* pVehicle, CVector vecTar
|
||||||
pVehicle->AutoPilot.m_aPathFindNodesInfo, &pVehicle->AutoPilot.m_nPathFindNodesCount);
|
pVehicle->AutoPilot.m_aPathFindNodesInfo, &pVehicle->AutoPilot.m_nPathFindNodesCount);
|
||||||
if (pVehicle->AutoPilot.m_nPathFindNodesCount < 2){
|
if (pVehicle->AutoPilot.m_nPathFindNodesCount < 2){
|
||||||
pVehicle->AutoPilot.m_nPrevRouteNode = pVehicle->AutoPilot.m_nCurrentRouteNode = pVehicle->AutoPilot.m_nNextRouteNode = 0;
|
pVehicle->AutoPilot.m_nPrevRouteNode = pVehicle->AutoPilot.m_nCurrentRouteNode = pVehicle->AutoPilot.m_nNextRouteNode = 0;
|
||||||
|
pVehicle->AutoPilot.m_nPathFindNodesCount = 0;
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
pVehicle->AutoPilot.m_nPrevRouteNode = 0;
|
pVehicle->AutoPilot.m_nPrevRouteNode = 0;
|
||||||
|
|
Loading…
Reference in a new issue