summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2020-04-11 12:21:21 +0200
committerSergeanur <s.anureev@yandex.ua>2020-04-11 12:21:21 +0200
commit0ddc04743cf119751e61ad7bec73b721116b3c03 (patch)
tree75bf39c19b98c2320aa14388bc81af2b905b94b0 /src/core
parentfixing r* visioned leak (diff)
downloadre3-0ddc04743cf119751e61ad7bec73b721116b3c03.tar
re3-0ddc04743cf119751e61ad7bec73b721116b3c03.tar.gz
re3-0ddc04743cf119751e61ad7bec73b721116b3c03.tar.bz2
re3-0ddc04743cf119751e61ad7bec73b721116b3c03.tar.lz
re3-0ddc04743cf119751e61ad7bec73b721116b3c03.tar.xz
re3-0ddc04743cf119751e61ad7bec73b721116b3c03.tar.zst
re3-0ddc04743cf119751e61ad7bec73b721116b3c03.zip
Diffstat (limited to '')
-rw-r--r--src/core/Cam.cpp2
-rw-r--r--src/core/Timer.h1
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; }