summaryrefslogtreecommitdiffstats
path: root/src/control/AutoPilot.h
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2020-05-05 17:20:10 +0200
committerNikolay Korolev <nickvnuk@gmail.com>2020-05-05 17:20:10 +0200
commitedeb8736f1af1f5680f8334414ad85c087b8c5e2 (patch)
tree655dc6cff470ac28d19678c392a0aebb49cea937 /src/control/AutoPilot.h
parentRevert "Remove #endif" (diff)
downloadre3-edeb8736f1af1f5680f8334414ad85c087b8c5e2.tar
re3-edeb8736f1af1f5680f8334414ad85c087b8c5e2.tar.gz
re3-edeb8736f1af1f5680f8334414ad85c087b8c5e2.tar.bz2
re3-edeb8736f1af1f5680f8334414ad85c087b8c5e2.tar.lz
re3-edeb8736f1af1f5680f8334414ad85c087b8c5e2.tar.xz
re3-edeb8736f1af1f5680f8334414ad85c087b8c5e2.tar.zst
re3-edeb8736f1af1f5680f8334414ad85c087b8c5e2.zip
Diffstat (limited to '')
-rw-r--r--src/control/AutoPilot.h8
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);