diff options
author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-04-11 20:02:31 +0200 |
---|---|---|
committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-04-11 20:02:31 +0200 |
commit | d010f6255a9e2567a240bb5a235ac8a340a6af9b (patch) | |
tree | 10306c47ef931167e74ee590bdae40bc6119040d /src/core | |
parent | CPools (diff) | |
parent | Merge remote-tracking branch 'upstream/master' (diff) | |
download | re3-d010f6255a9e2567a240bb5a235ac8a340a6af9b.tar re3-d010f6255a9e2567a240bb5a235ac8a340a6af9b.tar.gz re3-d010f6255a9e2567a240bb5a235ac8a340a6af9b.tar.bz2 re3-d010f6255a9e2567a240bb5a235ac8a340a6af9b.tar.lz re3-d010f6255a9e2567a240bb5a235ac8a340a6af9b.tar.xz re3-d010f6255a9e2567a240bb5a235ac8a340a6af9b.tar.zst re3-d010f6255a9e2567a240bb5a235ac8a340a6af9b.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/Cam.cpp | 2 | ||||
-rw-r--r-- | src/core/Timer.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/core/Cam.cpp b/src/core/Cam.cpp index dc9ef74f..cfdea46a 100644 --- a/src/core/Cam.cpp +++ b/src/core/Cam.cpp @@ -3511,7 +3511,7 @@ CCam::Process_FlyBy(const CVector&, float, float, float) Up = CVector(0.0f, 0.0f, 1.0f); if(TheCamera.m_bStartingSpline) - m_fTimeElapsedFloat += CTimer::GetTimeStepInMilliseconds(); + m_fTimeElapsedFloat += CTimer::GetTimeStepNonClippedInMilliseconds(); else{ m_fTimeElapsedFloat = 0.0f; m_uiFinishTime = MS(TheCamera.m_arrPathArray[2].m_arr_PathData[10*((int)TheCamera.m_arrPathArray[2].m_arr_PathData[0]-1) + 1]); diff --git a/src/core/Timer.h b/src/core/Timer.h index 2498ec8a..88a46661 100644 --- a/src/core/Timer.h +++ b/src/core/Timer.h @@ -21,6 +21,7 @@ public: static float GetTimeStepInMilliseconds() { return ms_fTimeStep / 50.0f * 1000.0f; } static const float &GetTimeStepNonClipped(void) { return ms_fTimeStepNonClipped; } static float GetTimeStepNonClippedInSeconds(void) { return ms_fTimeStepNonClipped / 50.0f; } + static float GetTimeStepNonClippedInMilliseconds(void) { return ms_fTimeStepNonClipped / 50.0f * 1000.0f; } static void SetTimeStepNonClipped(float ts) { ms_fTimeStepNonClipped = ts; } static const uint32 &GetFrameCounter(void) { return m_FrameCounter; } static void SetFrameCounter(uint32 fc) { m_FrameCounter = fc; } |