diff options
| author | aap <aap@papnet.eu> | 2019-08-11 22:15:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-11 22:15:31 +0200 |
| commit | b7471489faaae864c953aac45e58417d7236329d (patch) | |
| tree | 439de47b03e154a068f920274f5211d44c418dcc /src/control/Script.cpp | |
| parent | Merge pull request #185 from erorcun/erorcun (diff) | |
| parent | more CCarCtrl (diff) | |
| download | re3-b7471489faaae864c953aac45e58417d7236329d.tar re3-b7471489faaae864c953aac45e58417d7236329d.tar.gz re3-b7471489faaae864c953aac45e58417d7236329d.tar.bz2 re3-b7471489faaae864c953aac45e58417d7236329d.tar.lz re3-b7471489faaae864c953aac45e58417d7236329d.tar.xz re3-b7471489faaae864c953aac45e58417d7236329d.tar.zst re3-b7471489faaae864c953aac45e58417d7236329d.zip | |
Diffstat (limited to 'src/control/Script.cpp')
| -rw-r--r-- | src/control/Script.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/control/Script.cpp b/src/control/Script.cpp index 408771d1..c3c3a154 100644 --- a/src/control/Script.cpp +++ b/src/control/Script.cpp @@ -1924,7 +1924,7 @@ int8 CRunningScript::ProcessCommandsFrom100To199(int32 command) boat->m_status = STATUS_ABANDONED; boat->bIsLocked = true; boat->AutoPilot.m_nCarMission = MISSION_NONE; - boat->AutoPilot.m_nAnimationId = TEMPACT_NONE; /* Animation ID? */ + boat->AutoPilot.m_nTempAction = TEMPACT_NONE; /* Animation ID? */ boat->AutoPilot.m_nCruiseSpeed = boat->AutoPilot.m_fMaxTrafficSpeed = 20.0f; CWorld::Add(boat); handle = CPools::GetVehiclePool()->GetIndex(boat); @@ -1943,10 +1943,10 @@ int8 CRunningScript::ProcessCommandsFrom100To199(int32 command) car->bIsLocked = true; CCarCtrl::JoinCarWithRoadSystem(car); car->AutoPilot.m_nCarMission = MISSION_NONE; - car->AutoPilot.m_nAnimationId = TEMPACT_NONE; /* Animation ID? */ + car->AutoPilot.m_nTempAction = TEMPACT_NONE; /* Animation ID? */ car->AutoPilot.m_nDrivingStyle = DRIVINGSTYLE_STOP_FOR_CARS; car->AutoPilot.m_nCruiseSpeed = car->AutoPilot.m_fMaxTrafficSpeed = 9.0f; - car->AutoPilot.m_nPreviousLane = car->AutoPilot.m_nCurrentLane = 0; + car->AutoPilot.m_nCurrentLane = car->AutoPilot.m_nNextLane = 0; car->bEngineOn = false; car->m_level = CTheZones::GetLevelFromPosition(pos); car->bHasBeenOwnedByPlayer = true; |