diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-04-11 20:02:04 +0200 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-04-11 20:02:04 +0200 |
| commit | fbb1bc5b0d1a14f0b29d7c8739c3b7d105546d50 (patch) | |
| tree | d9fd307ecb19dbea1db29a0b53cd5c46a6a63120 /src/core | |
| parent | fixed malloc/new (diff) | |
| parent | Merge branch 'master' of github.com:gtamodding/re3 (diff) | |
| download | re3-fbb1bc5b0d1a14f0b29d7c8739c3b7d105546d50.tar re3-fbb1bc5b0d1a14f0b29d7c8739c3b7d105546d50.tar.gz re3-fbb1bc5b0d1a14f0b29d7c8739c3b7d105546d50.tar.bz2 re3-fbb1bc5b0d1a14f0b29d7c8739c3b7d105546d50.tar.lz re3-fbb1bc5b0d1a14f0b29d7c8739c3b7d105546d50.tar.xz re3-fbb1bc5b0d1a14f0b29d7c8739c3b7d105546d50.tar.zst re3-fbb1bc5b0d1a14f0b29d7c8739c3b7d105546d50.zip | |
Diffstat (limited to 'src/core')
| -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; } |