diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/Timer.h | 4 | ||||
| -rw-r--r-- | src/core/re3.cpp | 12 | ||||
| -rw-r--r-- | src/vehicles/Automobile.cpp | 2 |
3 files changed, 3 insertions, 15 deletions
diff --git a/src/core/Timer.h b/src/core/Timer.h index b2b8e633..6f100c63 100644 --- a/src/core/Timer.h +++ b/src/core/Timer.h @@ -24,10 +24,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/core/re3.cpp b/src/core/re3.cpp index d02bd9b0..cb249f53 100644 --- a/src/core/re3.cpp +++ b/src/core/re3.cpp @@ -386,25 +386,13 @@ DebugMenuPopulate(void) DebugMenuAddCmd("Debug", "Toggle Comedy Controls", ToggleComedy); DebugMenuAddCmd("Debug", "Place Car on Road", PlaceOnRoad); - DebugMenuAddVarBool8("Debug", "Catalina Heli On", &CHeli::CatalinaHeliOn, nil); - DebugMenuAddCmd("Debug", "Catalina Fly By", CHeli::StartCatalinaFlyBy); - DebugMenuAddCmd("Debug", "Catalina Take Off", CHeli::CatalinaTakeOff); - DebugMenuAddCmd("Debug", "Catalina Fly Away", CHeli::MakeCatalinaHeliFlyAway); DebugMenuAddVarBool8("Debug", "Script Heli On", &CHeli::ScriptHeliOn, nil); -#ifdef TOGGLEABLE_BETA_FEATURES - DebugMenuAddVarBool8("Debug", "Toggle popping heads on headshot", &CPed::bPopHeadsOnHeadshot, nil); - DebugMenuAddVarBool8("Debug", "Toggle peds running to phones to report crimes", &CPed::bMakePedsRunToPhonesToReportCrimes, nil); -#endif - DebugMenuAddCmd("Debug", "Start Credits", CCredits::Start); DebugMenuAddCmd("Debug", "Stop Credits", CCredits::Stop); #ifdef RELOADABLES DebugMenuAddCmd("Reload", "HUD.TXD", CHud::ReloadTXD); - DebugMenuAddCmd("Reload", "FONTS.TXD", NULL); - DebugMenuAddCmd("Reload", "FRONTEN1.TXD", NULL); - DebugMenuAddCmd("Reload", "FRONTEN2.TXD", NULL); #endif extern bool PrintDebugCode; 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(); } |