From fdf8f35049a0126f848f286483a5a042fc0cc34e Mon Sep 17 00:00:00 2001 From: aap Date: Mon, 1 Jun 2020 20:51:18 +0200 Subject: CTimer fix --- src/core/Timer.h | 4 ++-- src/vehicles/Automobile.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/core/Timer.h b/src/core/Timer.h index e7b6fec8..4e8b8805 100644 --- a/src/core/Timer.h +++ b/src/core/Timer.h @@ -18,10 +18,10 @@ public: static const float &GetTimeStep(void) { return ms_fTimeStep; } static void SetTimeStep(float ts) { ms_fTimeStep = ts; } static float GetTimeStepInSeconds() { return ms_fTimeStep / 50.0f; } - static float GetTimeStepInMilliseconds() { return ms_fTimeStep / 50.0f * 1000.0f; } + static uint32 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 uint32 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; } diff --git a/src/vehicles/Automobile.cpp b/src/vehicles/Automobile.cpp index bb6a6bd6..450d32c1 100644 --- a/src/vehicles/Automobile.cpp +++ b/src/vehicles/Automobile.cpp @@ -840,7 +840,7 @@ CAutomobile::ProcessControl(void) if(GetStatus() == STATUS_PLAYER && pHandling->Flags & HANDLING_IS_BUS){ if(m_nBusDoorTimerEnd == 0) m_nBusDoorTimerEnd = 1000; - else if(m_nBusDoorTimerEnd > (uint32)CTimer::GetTimeStepInMilliseconds()) + else if(m_nBusDoorTimerEnd > CTimer::GetTimeStepInMilliseconds()) m_nBusDoorTimerEnd -= CTimer::GetTimeStepInMilliseconds(); } -- cgit v1.2.3