summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-06-01 20:51:18 +0200
committeraap <aap@papnet.eu>2020-06-01 20:51:18 +0200
commitfdf8f35049a0126f848f286483a5a042fc0cc34e (patch)
tree27eccd49357d32a6c4b5f8394e6d99a479181e38
parenthanim fix (diff)
downloadre3-fdf8f35049a0126f848f286483a5a042fc0cc34e.tar
re3-fdf8f35049a0126f848f286483a5a042fc0cc34e.tar.gz
re3-fdf8f35049a0126f848f286483a5a042fc0cc34e.tar.bz2
re3-fdf8f35049a0126f848f286483a5a042fc0cc34e.tar.lz
re3-fdf8f35049a0126f848f286483a5a042fc0cc34e.tar.xz
re3-fdf8f35049a0126f848f286483a5a042fc0cc34e.tar.zst
re3-fdf8f35049a0126f848f286483a5a042fc0cc34e.zip
-rw-r--r--src/core/Timer.h4
-rw-r--r--src/vehicles/Automobile.cpp2
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();
}