diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2019-10-12 21:23:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-12 21:23:37 +0200 |
| commit | 225ad5d78ebff032640d319f4757cc0ef9e03b24 (patch) | |
| tree | 398f3fbc01a291239c5cc55c321ae00c1cfbd3d0 /src/control | |
| parent | Fixed floating package pickups (diff) | |
| parent | fixes (diff) | |
| download | re3-225ad5d78ebff032640d319f4757cc0ef9e03b24.tar re3-225ad5d78ebff032640d319f4757cc0ef9e03b24.tar.gz re3-225ad5d78ebff032640d319f4757cc0ef9e03b24.tar.bz2 re3-225ad5d78ebff032640d319f4757cc0ef9e03b24.tar.lz re3-225ad5d78ebff032640d319f4757cc0ef9e03b24.tar.xz re3-225ad5d78ebff032640d319f4757cc0ef9e03b24.tar.zst re3-225ad5d78ebff032640d319f4757cc0ef9e03b24.zip | |
Diffstat (limited to 'src/control')
| -rw-r--r-- | src/control/CarCtrl.cpp | 3 | ||||
| -rw-r--r-- | src/control/Script.cpp | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/control/CarCtrl.cpp b/src/control/CarCtrl.cpp index 5923642d..fd6d8057 100644 --- a/src/control/CarCtrl.cpp +++ b/src/control/CarCtrl.cpp @@ -1649,7 +1649,8 @@ void CCarCtrl::PickNextNodeToChaseCar(CVehicle* pVehicle, float targetX, float t int16 numNodes; float distanceToTargetNode; #ifndef REMOVE_TREADABLE_PATHFIND - if (pTarget && pTarget->m_pCurGroundEntity->m_type == ENTITY_TYPE_BUILDING && + if (pTarget && pTarget->m_pCurGroundEntity && + pTarget->m_pCurGroundEntity->m_type == ENTITY_TYPE_BUILDING && ((CBuilding*)pTarget->m_pCurGroundEntity)->GetIsATreadable() && ((CTreadable*)pTarget->m_pCurGroundEntity)->m_nodeIndices[0][0] >= 0){ CTreadable* pCurrentMapObject = (CTreadable*)pTarget->m_pCurGroundEntity; diff --git a/src/control/Script.cpp b/src/control/Script.cpp index db4ef82f..5885b310 100644 --- a/src/control/Script.cpp +++ b/src/control/Script.cpp @@ -1988,7 +1988,7 @@ int8 CRunningScript::ProcessCommandsFrom100To199(int32 command) car->m_status = STATUS_PHYSICS; car->bEngineOn = true; car->AutoPilot.m_nCruiseSpeed = max(car->AutoPilot.m_nCruiseSpeed, 6); - car->AutoPilot.m_nTimeToStartMission = CTimer::GetTimeInMilliseconds(); + car->AutoPilot.m_nAntiReverseTimer = CTimer::GetTimeInMilliseconds(); return 0; } case COMMAND_CAR_WANDER_RANDOMLY: @@ -2000,7 +2000,7 @@ int8 CRunningScript::ProcessCommandsFrom100To199(int32 command) car->AutoPilot.m_nCarMission = MISSION_CRUISE; car->bEngineOn = true; car->AutoPilot.m_nCruiseSpeed = max(car->AutoPilot.m_nCruiseSpeed, 6); - car->AutoPilot.m_nTimeToStartMission = CTimer::GetTimeInMilliseconds(); + car->AutoPilot.m_nAntiReverseTimer = CTimer::GetTimeInMilliseconds(); return 0; } case COMMAND_CAR_SET_IDLE: @@ -2100,7 +2100,7 @@ int8 CRunningScript::ProcessCommandsFrom100To199(int32 command) CVehicle* car = CPools::GetVehiclePool()->GetAt(ScriptParams[0]); assert(car); car->AutoPilot.m_nCarMission = (eCarMission)ScriptParams[1]; - car->AutoPilot.m_nTimeToStartMission = CTimer::GetTimeInMilliseconds(); + car->AutoPilot.m_nAntiReverseTimer = CTimer::GetTimeInMilliseconds(); car->bEngineOn = true; return 0; } |