From 556974441ef01c0ca1934a23f3958c522274e605 Mon Sep 17 00:00:00 2001 From: Rachael Alexanderson Date: Wed, 15 Nov 2017 22:36:47 -0500 Subject: [PATCH] Revert "Merge ../gzdoom" This reverts commit ee7ea6b9a2e501b6f34f7aa793b22a4f8347fb82, reversing changes made to c04b50c41fe64e56d9dedc74e72ce7979501bee3. --- src/i_time.cpp | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/src/i_time.cpp b/src/i_time.cpp index 4aa14c6f4..050bb1ebc 100644 --- a/src/i_time.cpp +++ b/src/i_time.cpp @@ -38,8 +38,6 @@ #include #include "i_time.h" #include "doomdef.h" -#include "c_cvars.h" -#include "doomstat.h" //========================================================================== // @@ -51,30 +49,10 @@ static uint64_t FirstFrameStartTime; static uint64_t CurrentFrameStartTime; static uint64_t FreezeTime; -static double TimeScale = 1.0; - -CUSTOM_CVAR(Float, i_timescale, 1.0f, CVAR_NOINITCALL) -{ - if (netgame && self != 1.0f) - { - Printf("Time scale cannot be changed in net games.\n"); - self = 1.0f; - } - else - { - I_FreezeTime(true); - float clampValue = (self < 0.05) ? 0.05 : self; - if (self != clampValue) - self = clampValue; - TimeScale = self; - I_FreezeTime(false); - } -} - static uint64_t GetClockTimeNS() { using namespace std::chrono; - return (uint64_t)duration_cast(steady_clock::now().time_since_epoch()).count() * TimeScale; + return (uint64_t)duration_cast(steady_clock::now().time_since_epoch()).count(); } static uint64_t MSToNS(unsigned int ms)