diff options
| author | aap <aap@papnet.eu> | 2019-07-07 10:16:16 +0200 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2019-07-07 10:16:16 +0200 |
| commit | 533f265f55ffea86a2090e3cd44f9efe69df8b57 (patch) | |
| tree | b13d1b1fa4818da40915c4a58c2fb61e5f07c421 /src/control | |
| parent | Merge pull request #114 from Nick007J/master (diff) | |
| download | re3-533f265f55ffea86a2090e3cd44f9efe69df8b57.tar re3-533f265f55ffea86a2090e3cd44f9efe69df8b57.tar.gz re3-533f265f55ffea86a2090e3cd44f9efe69df8b57.tar.bz2 re3-533f265f55ffea86a2090e3cd44f9efe69df8b57.tar.lz re3-533f265f55ffea86a2090e3cd44f9efe69df8b57.tar.xz re3-533f265f55ffea86a2090e3cd44f9efe69df8b57.tar.zst re3-533f265f55ffea86a2090e3cd44f9efe69df8b57.zip | |
Diffstat (limited to 'src/control')
| -rw-r--r-- | src/control/Replay.h | 4 | ||||
| -rw-r--r-- | src/control/Script.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/control/Replay.h b/src/control/Replay.h index e6885f59..cd8d9a45 100644 --- a/src/control/Replay.h +++ b/src/control/Replay.h @@ -262,8 +262,8 @@ public: static void StreamAllNecessaryCarsAndPeds(void); static bool ShouldStandardCameraBeProcessed(void); - inline static bool IsPlayingBack() { return Mode == MODE_PLAYBACK; } - inline static bool IsPlayingBackFromFile() { return bPlayingBackFromFile; } + static bool IsPlayingBack() { return Mode == MODE_PLAYBACK; } + static bool IsPlayingBackFromFile() { return bPlayingBackFromFile; } private: static void RecordThisFrame(void); diff --git a/src/control/Script.cpp b/src/control/Script.cpp index 06edd16a..af151802 100644 --- a/src/control/Script.cpp +++ b/src/control/Script.cpp @@ -151,7 +151,7 @@ bool CUpsideDownCarCheck::IsCarUpsideDown(int32 id) void CUpsideDownCarCheck::UpdateTimers() { - uint32 timeStep = CTimer::GetFrameTimeStepInMilliseconds(); + uint32 timeStep = CTimer::GetTimeStepInMilliseconds(); for (int i = 0; i < MAX_UPSIDEDOWN_CAR_CHECKS; i++){ CVehicle* v = CPools::GetVehiclePool()->GetAt(m_sCars[i].m_nVehicleIndex); if (v){ |