diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2020-05-05 17:04:18 +0200 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2020-05-05 17:04:18 +0200 |
| commit | 9960c411933f9a804eb5f6840d75ad00fd255252 (patch) | |
| tree | 19886c3263958d5c77664518270d252ad5554602 /src/control/AutoPilot.h | |
| parent | Merge pull request #512 from Nick007J/master (diff) | |
| download | re3-9960c411933f9a804eb5f6840d75ad00fd255252.tar re3-9960c411933f9a804eb5f6840d75ad00fd255252.tar.gz re3-9960c411933f9a804eb5f6840d75ad00fd255252.tar.bz2 re3-9960c411933f9a804eb5f6840d75ad00fd255252.tar.lz re3-9960c411933f9a804eb5f6840d75ad00fd255252.tar.xz re3-9960c411933f9a804eb5f6840d75ad00fd255252.tar.zst re3-9960c411933f9a804eb5f6840d75ad00fd255252.zip | |
Diffstat (limited to 'src/control/AutoPilot.h')
| -rw-r--r-- | src/control/AutoPilot.h | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/src/control/AutoPilot.h b/src/control/AutoPilot.h index 48a0c4de..345f4cb4 100644 --- a/src/control/AutoPilot.h +++ b/src/control/AutoPilot.h @@ -26,15 +26,6 @@ enum eCarMission : uint8 MISSION_BLOCKCAR_FARAWAY, MISSION_BLOCKCAR_CLOSE, MISSION_BLOCKCAR_HANDBRAKESTOP, -#ifdef MIAMI - MISSION_HELI_FLYTOCOORS, - MISSION_ATTACKPLAYER, - MISSION_PLANE_FLYTOCOORS, - MISSION_HELI_LAND, - MISSION_SLOWLY_DRIVE_TOWARDS_PLAYER_1, - MISSION_SLOWLY_DRIVE_TOWARDS_PLAYER_2, - MISSION_BLOCKPLAYER_FORWARDANDBACK -#endif }; enum eCarTempAction : uint8 @@ -84,18 +75,11 @@ 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 +109,6 @@ 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); @@ -139,3 +119,4 @@ public: #endif }; +static_assert(sizeof(CAutoPilot) == 0x70, "CAutoPilot: error");
\ No newline at end of file |