diff options
Diffstat (limited to 'src/vehicles')
| -rw-r--r-- | src/vehicles/Automobile.cpp | 8 | ||||
| -rw-r--r-- | src/vehicles/Vehicle.cpp | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/vehicles/Automobile.cpp b/src/vehicles/Automobile.cpp index 905a8338..925bc884 100644 --- a/src/vehicles/Automobile.cpp +++ b/src/vehicles/Automobile.cpp @@ -322,7 +322,7 @@ CAutomobile::ProcessControl(void) if(!pDriver->IsPlayer() && !(pDriver->m_leader && pDriver->m_leader->bInVehicle) && pDriver->CharCreatedBy != MISSION_CHAR) - pDriver->SetObjective(OBJECTIVE_LEAVE_VEHICLE, this); + pDriver->SetObjective(OBJECTIVE_LEAVE_CAR, this); } ActivateBombWhenEntered(); @@ -334,7 +334,7 @@ CAutomobile::ProcessControl(void) if(!pPassengers[i]->IsPlayer() && !(pPassengers[i]->m_leader && pPassengers[i]->m_leader->bInVehicle) && pPassengers[i]->CharCreatedBy != MISSION_CHAR) - pPassengers[i]->SetObjective(OBJECTIVE_LEAVE_VEHICLE, this); + pPassengers[i]->SetObjective(OBJECTIVE_LEAVE_CAR, this); } CRubbish::StirUp(this); @@ -442,7 +442,7 @@ CAutomobile::ProcessControl(void) }else if(pDriver && pDriver->IsPlayer() && (pDriver->GetPedState() == PED_ARRESTED || pDriver->GetPedState() == PED_DRAG_FROM_CAR || - (pDriver->GetPedState() == PED_EXIT_CAR || pDriver->m_objective == OBJECTIVE_LEAVE_VEHICLE) && !CanPedJumpOutCar())){ + (pDriver->GetPedState() == PED_EXIT_CAR || pDriver->m_objective == OBJECTIVE_LEAVE_CAR) && !CanPedJumpOutCar())){ bIsHandbrakeOn = true; m_fBrakePedal = 1.0f; m_fGasPedal = 0.0f; @@ -532,7 +532,7 @@ CAutomobile::ProcessControl(void) (pDriver && pDriver->IsPlayer() && (pDriver->GetPedState() == PED_ARRESTED || pDriver->GetPedState() == PED_DRAG_FROM_CAR || - (pDriver->GetPedState() == PED_EXIT_CAR || pDriver->m_objective == OBJECTIVE_LEAVE_VEHICLE) && !CanPedJumpOutCar()))){ + (pDriver->GetPedState() == PED_EXIT_CAR || pDriver->m_objective == OBJECTIVE_LEAVE_CAR) && !CanPedJumpOutCar()))){ bIsHandbrakeOn = true; m_fBrakePedal = 1.0f; m_fGasPedal = 0.0f; diff --git a/src/vehicles/Vehicle.cpp b/src/vehicles/Vehicle.cpp index 2c770834..360b843b 100644 --- a/src/vehicles/Vehicle.cpp +++ b/src/vehicles/Vehicle.cpp @@ -1228,7 +1228,7 @@ CVehicle::InflictDamage(CEntity *damagedBy, eWeaponType weaponType, float damage if(AutoPilot.m_nDrivingStyle == DRIVINGSTYLE_PLOUGH_THROUGH || CGeneral::GetRandomNumberInRange(0.0f, 1.0f) > 0.5f && AutoPilot.m_nCarMission == MISSION_CRUISE){ // Drive away like a maniac - if(pDriver && pDriver->m_objective != OBJECTIVE_LEAVE_VEHICLE){ + if(pDriver && pDriver->m_objective != OBJECTIVE_LEAVE_CAR){ if(AutoPilot.m_nDrivingStyle != DRIVINGSTYLE_PLOUGH_THROUGH) AutoPilot.m_nCruiseSpeed *= 1.5f; AutoPilot.m_nDrivingStyle = DRIVINGSTYLE_PLOUGH_THROUGH; @@ -1238,16 +1238,16 @@ CVehicle::InflictDamage(CEntity *damagedBy, eWeaponType weaponType, float damage if (pDriver && pDriver->CharCreatedBy != MISSION_CHAR) { SetStatus(STATUS_ABANDONED); pDriver->bFleeAfterExitingCar = true; - pDriver->SetObjective(OBJECTIVE_LEAVE_VEHICLE, this); + pDriver->SetObjective(OBJECTIVE_LEAVE_CAR, this); pDriver->Say(SOUND_PED_FLEE_SPRINT); } int time = 200; for (int i = 0; i < m_nNumMaxPassengers; i++) { if (pPassengers[i] && - pPassengers[i]->m_objective != OBJECTIVE_LEAVE_VEHICLE && + pPassengers[i]->m_objective != OBJECTIVE_LEAVE_CAR && pPassengers[i]->CharCreatedBy != MISSION_CHAR) { pPassengers[i]->bFleeAfterExitingCar = true; - pPassengers[i]->SetObjective(OBJECTIVE_LEAVE_VEHICLE, this); + pPassengers[i]->SetObjective(OBJECTIVE_LEAVE_CAR, this); pPassengers[i]->m_objectiveTimer = CTimer::GetTimeInMilliseconds() + time; pPassengers[i]->Say(SOUND_PED_FLEE_SPRINT); time += 200; @@ -1504,7 +1504,7 @@ CVehicle::MakeNonDraggedPedsLeaveVehicle(CPed *ped1, CPed *ped2, CPlayerPed *&pl int time = 1800; for(i = 0; i < numPeds3; i++){ peds3[i]->m_leaveCarTimer = CTimer::GetTimeInMilliseconds() + time; - peds3[i]->SetObjective(OBJECTIVE_LEAVE_VEHICLE, this); + peds3[i]->SetObjective(OBJECTIVE_LEAVE_CAR, this); time += CGeneral::GetRandomNumberInRange(300.0f, 600.0f); } |