diff options
| author | aap <aap@papnet.eu> | 2020-05-05 17:23:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-05 17:23:23 +0200 |
| commit | 2c0b82ec1a0bcb1f3b0d0215a97e964059617a39 (patch) | |
| tree | 655dc6cff470ac28d19678c392a0aebb49cea937 /src/control/AutoPilot.h | |
| parent | Revert "Remove ColStore" (diff) | |
| parent | Merge remote-tracking branch 'upstream/miami' into miami (diff) | |
| download | re3-2c0b82ec1a0bcb1f3b0d0215a97e964059617a39.tar re3-2c0b82ec1a0bcb1f3b0d0215a97e964059617a39.tar.gz re3-2c0b82ec1a0bcb1f3b0d0215a97e964059617a39.tar.bz2 re3-2c0b82ec1a0bcb1f3b0d0215a97e964059617a39.tar.lz re3-2c0b82ec1a0bcb1f3b0d0215a97e964059617a39.tar.xz re3-2c0b82ec1a0bcb1f3b0d0215a97e964059617a39.tar.zst re3-2c0b82ec1a0bcb1f3b0d0215a97e964059617a39.zip | |
Diffstat (limited to 'src/control/AutoPilot.h')
| -rw-r--r-- | src/control/AutoPilot.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/control/AutoPilot.h b/src/control/AutoPilot.h index 48a0c4de..24e7cc53 100644 --- a/src/control/AutoPilot.h +++ b/src/control/AutoPilot.h @@ -26,7 +26,6 @@ enum eCarMission : uint8 MISSION_BLOCKCAR_FARAWAY, MISSION_BLOCKCAR_CLOSE, MISSION_BLOCKCAR_HANDBRAKESTOP, -#ifdef MIAMI MISSION_HELI_FLYTOCOORS, MISSION_ATTACKPLAYER, MISSION_PLANE_FLYTOCOORS, @@ -34,7 +33,6 @@ enum eCarMission : uint8 MISSION_SLOWLY_DRIVE_TOWARDS_PLAYER_1, MISSION_SLOWLY_DRIVE_TOWARDS_PLAYER_2, MISSION_BLOCKPLAYER_FORWARDANDBACK -#endif }; enum eCarTempAction : uint8 @@ -84,18 +82,14 @@ public: uint32 m_nTimeTempAction; float m_fMaxTrafficSpeed; uint8 m_nCruiseSpeed; -#ifdef MIAMI uint8 m_nCruiseSpeedMultiplierType; float m_fCruiseSpeedMultiplier; -#endif uint8 m_bSlowedDownBecauseOfCars : 1; uint8 m_bSlowedDownBecauseOfPeds : 1; uint8 m_bStayInCurrentLevel : 1; uint8 m_bStayInFastLane : 1; uint8 m_bIgnorePathfinding : 1; -#ifdef MIAMI uint8 m_nSwitchDistance; -#endif CVector m_vecDestinationCoors; CPathNode *m_aPathFindNodesInfo[NUM_PATH_NODES_IN_AUTOPILOT]; int16 m_nPathFindNodesCount; @@ -125,10 +119,8 @@ public: m_nTimeToStartMission = CTimer::GetTimeInMilliseconds(); m_nAntiReverseTimer = m_nTimeToStartMission; m_bStayInFastLane = false; -#ifdef MIAMI m_nCruiseSpeedMultiplierType = 0; m_fCruiseSpeedMultiplier = 1.0f; -#endif } void ModifySpeed(float); |