summaryrefslogtreecommitdiffstats
path: root/src/control/AutoPilot.h
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2020-05-05 16:14:13 +0200
committerGitHub <noreply@github.com>2020-05-05 16:14:13 +0200
commitdfe0642195bd17704aaac669908c8bb29fbcb531 (patch)
tree99f4d7dec983e7ad6f4071cc259c8c0de2eda2e2 /src/control/AutoPilot.h
parentMerge pull request #510 from aap/master (diff)
parentMerge remote-tracking branch 'upstream/master' (diff)
downloadre3-dfe0642195bd17704aaac669908c8bb29fbcb531.tar
re3-dfe0642195bd17704aaac669908c8bb29fbcb531.tar.gz
re3-dfe0642195bd17704aaac669908c8bb29fbcb531.tar.bz2
re3-dfe0642195bd17704aaac669908c8bb29fbcb531.tar.lz
re3-dfe0642195bd17704aaac669908c8bb29fbcb531.tar.xz
re3-dfe0642195bd17704aaac669908c8bb29fbcb531.tar.zst
re3-dfe0642195bd17704aaac669908c8bb29fbcb531.zip
Diffstat (limited to '')
-rw-r--r--src/control/AutoPilot.h14
1 files changed, 13 insertions, 1 deletions
diff --git a/src/control/AutoPilot.h b/src/control/AutoPilot.h
index 4c356f96..48a0c4de 100644
--- a/src/control/AutoPilot.h
+++ b/src/control/AutoPilot.h
@@ -26,6 +26,7 @@ enum eCarMission : uint8
MISSION_BLOCKCAR_FARAWAY,
MISSION_BLOCKCAR_CLOSE,
MISSION_BLOCKCAR_HANDBRAKESTOP,
+#ifdef MIAMI
MISSION_HELI_FLYTOCOORS,
MISSION_ATTACKPLAYER,
MISSION_PLANE_FLYTOCOORS,
@@ -33,6 +34,7 @@ enum eCarMission : uint8
MISSION_SLOWLY_DRIVE_TOWARDS_PLAYER_1,
MISSION_SLOWLY_DRIVE_TOWARDS_PLAYER_2,
MISSION_BLOCKPLAYER_FORWARDANDBACK
+#endif
};
enum eCarTempAction : uint8
@@ -82,11 +84,18 @@ 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;
@@ -116,6 +125,10 @@ 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);
@@ -126,4 +139,3 @@ public:
#endif
};
-static_assert(sizeof(CAutoPilot) == 0x70, "CAutoPilot: error");