summaryrefslogtreecommitdiffstats
path: root/src/control/AutoPilot.h
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2019-08-06 23:32:19 +0200
committerNikolay Korolev <nickvnuk@gmail.com>2019-08-06 23:32:19 +0200
commit4ae4bc94c692d9fe5781d36a7be6ab72803f6162 (patch)
treebacd3caa49fb507ff6d4f3b15b89d4bb85348d5d /src/control/AutoPilot.h
parentfixed COMMAND_ADD_BLIP_FOR_COORD_OLD (diff)
downloadre3-4ae4bc94c692d9fe5781d36a7be6ab72803f6162.tar
re3-4ae4bc94c692d9fe5781d36a7be6ab72803f6162.tar.gz
re3-4ae4bc94c692d9fe5781d36a7be6ab72803f6162.tar.bz2
re3-4ae4bc94c692d9fe5781d36a7be6ab72803f6162.tar.lz
re3-4ae4bc94c692d9fe5781d36a7be6ab72803f6162.tar.xz
re3-4ae4bc94c692d9fe5781d36a7be6ab72803f6162.tar.zst
re3-4ae4bc94c692d9fe5781d36a7be6ab72803f6162.zip
Diffstat (limited to 'src/control/AutoPilot.h')
-rw-r--r--src/control/AutoPilot.h13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/control/AutoPilot.h b/src/control/AutoPilot.h
index b1c824d8..3ace0a51 100644
--- a/src/control/AutoPilot.h
+++ b/src/control/AutoPilot.h
@@ -1,4 +1,5 @@
#pragma once
+#include "Timer.h"
class CVehicle;
@@ -62,15 +63,15 @@ public:
uint32 m_nCurrentRouteNode;
uint32 m_nNextRouteNode;
uint32 m_nPrevRouteNode;
- uint32 m_nTotalSpeedScaleFactor;
- uint32 m_nSpeedScaleFactor;
+ uint32 m_nTimeEnteredCurve;
+ uint32 m_nCurveSpeedScale;
uint32 m_nCurrentPathNodeInfo;
uint32 m_nNextPathNodeInfo;
uint32 m_nPreviousPathNodeInfo;
uint32 m_nTimeToStartMission;
uint32 m_nTimeSwitchedToRealPhysics;
int8 m_nPreviousDirection;
- int8 m_nCurrentDirecton;
+ int8 m_nCurrentDirection;
int8 m_nNextDirection;
int8 m_nPreviousLane;
int8 m_nCurrentLane;
@@ -94,13 +95,13 @@ public:
m_nPrevRouteNode = 0;
m_nNextRouteNode = m_nPrevRouteNode;
m_nCurrentRouteNode = m_nNextRouteNode;
- m_nTotalSpeedScaleFactor = 0;
- m_nSpeedScaleFactor = 1000;
+ m_nTimeEnteredCurve = 0;
+ m_nCurveSpeedScale = 1000;
m_nPreviousPathNodeInfo = 0;
m_nNextPathNodeInfo = m_nPreviousPathNodeInfo;
m_nCurrentPathNodeInfo = m_nNextPathNodeInfo;
m_nNextDirection = 1;
- m_nCurrentDirecton = m_nNextDirection;
+ m_nCurrentDirection = m_nNextDirection;
m_nPreviousLane = m_nCurrentLane = 0;
m_nDrivingStyle = DRIVINGSTYLE_STOP_FOR_CARS;
m_nCarMission = MISSION_NONE;