From aba5c4c134d0751fa57e805fcd717c4e2ec0681d Mon Sep 17 00:00:00 2001 From: Mitchell Richters Date: Wed, 26 Aug 2020 09:27:09 +1000 Subject: [PATCH] - All Games: Remove use of `timerGetHiTicks()`. --- source/blood/src/blood.cpp | 6 +++--- source/blood/src/controls.cpp | 2 +- source/blood/src/view.cpp | 2 +- source/build/include/timer.h | 1 - source/build/src/engine.cpp | 2 +- source/build/src/timer.cpp | 4 ---- source/exhumed/src/exhumed.cpp | 2 +- source/exhumed/src/player.cpp | 2 +- source/sw/src/input.cpp | 2 +- 9 files changed, 9 insertions(+), 14 deletions(-) diff --git a/source/blood/src/blood.cpp b/source/blood/src/blood.cpp index 2c1ea2998..26f8cbfa6 100644 --- a/source/blood/src/blood.cpp +++ b/source/blood/src/blood.cpp @@ -783,7 +783,7 @@ static void gameInit() static void gameTicker() { bool gameUpdate = false; - double const gameUpdateStartTime = timerGetHiTicks(); + double const gameUpdateStartTime = I_msTimeF(); while (gPredictTail < gNetFifoHead[myconnectindex] && !paused) { viewUpdatePrediction(&gFifoInput[gPredictTail & 255][myconnectindex]); @@ -815,7 +815,7 @@ static void gameTicker() } if (gameUpdate) { - g_gameUpdateTime = timerGetHiTicks() - gameUpdateStartTime; + g_gameUpdateTime = I_msTimeF() - gameUpdateStartTime; if (g_gameUpdateAvgTime < 0.f) g_gameUpdateAvgTime = g_gameUpdateTime; g_gameUpdateAvgTime = ((GAMEUPDATEAVGTIMENUMSAMPLES - 1.f) * g_gameUpdateAvgTime + g_gameUpdateTime) / ((float)GAMEUPDATEAVGTIMENUMSAMPLES); @@ -826,7 +826,7 @@ static void gameTicker() { netCheckSync(); viewDrawScreen(); - g_gameUpdateAndDrawTime = g_beforeSwapTime/* timerGetHiTicks()*/ - gameUpdateStartTime; + g_gameUpdateAndDrawTime = g_beforeSwapTime/* I_msTimeF()*/ - gameUpdateStartTime; } } diff --git a/source/blood/src/controls.cpp b/source/blood/src/controls.cpp index 94fdcfa53..5459d0204 100644 --- a/source/blood/src/controls.cpp +++ b/source/blood/src/controls.cpp @@ -112,7 +112,7 @@ void ctrlGetInput(void) ControlInfo info; static double lastInputTicks; - auto const currentHiTicks = timerGetHiTicks(); + auto const currentHiTicks = I_msTimeF(); double const elapsedInputTicks = currentHiTicks - lastInputTicks; lastInputTicks = currentHiTicks; diff --git a/source/blood/src/view.cpp b/source/blood/src/view.cpp index 8255faf49..63c150316 100644 --- a/source/blood/src/view.cpp +++ b/source/blood/src/view.cpp @@ -1105,7 +1105,7 @@ FString GameInterface::statFPS(void) static float lastFPS, minFPS = FLT_MAX, maxFPS; static double minGameUpdate = DBL_MAX, maxGameUpdate; - double frameTime = timerGetHiTicks(); + double frameTime = I_msTimeF(); double frameDelay = frameTime - lastFrameTime; cumulativeFrameDelay += frameDelay; diff --git a/source/build/include/timer.h b/source/build/include/timer.h index 3d629abb4..e0e0dbff8 100644 --- a/source/build/include/timer.h +++ b/source/build/include/timer.h @@ -8,7 +8,6 @@ // for compatibility #define timerUninit() -double timerGetHiTicks(void); uint32_t timerGetTicks(void); #endif // timer_h__ diff --git a/source/build/src/engine.cpp b/source/build/src/engine.cpp index b46d8a77f..098ce0ecd 100644 --- a/source/build/src/engine.cpp +++ b/source/build/src/engine.cpp @@ -2722,7 +2722,7 @@ int32_t videoSetGameMode(char davidoption, int32_t daupscaledxdim, int32_t daups // void videoNextPage(void) { - g_beforeSwapTime = timerGetHiTicks(); + g_beforeSwapTime = I_msTimeF(); videoShowFrame(0); omdtims = mdtims; diff --git a/source/build/src/timer.cpp b/source/build/src/timer.cpp index b6cb31446..2bc5a91bf 100644 --- a/source/build/src/timer.cpp +++ b/source/build/src/timer.cpp @@ -16,7 +16,3 @@ static time_point timerlastsample; static int timerticspersec; uint32_t timerGetTicks(void) { return duration_cast(steady_clock::now().time_since_epoch()).count(); } - -// Returns the time since an unspecified starting time in milliseconds. -// (May be not monotonic for certain configurations.) -double timerGetHiTicks(void) { return duration(steady_clock::now().time_since_epoch()).count() / 1000000.0; } diff --git a/source/exhumed/src/exhumed.cpp b/source/exhumed/src/exhumed.cpp index 3487d0a95..7d884a302 100644 --- a/source/exhumed/src/exhumed.cpp +++ b/source/exhumed/src/exhumed.cpp @@ -401,7 +401,7 @@ FString GameInterface::statFPS() static float lastFPS; // , minFPS = std::numeric_limits::max(), maxFPS; //static double minGameUpdate = std::numeric_limits::max(), maxGameUpdate; - double frameTime = timerGetHiTicks(); + double frameTime = I_msTimeF(); double frameDelay = frameTime - lastFrameTime; cumulativeFrameDelay += frameDelay; diff --git a/source/exhumed/src/player.cpp b/source/exhumed/src/player.cpp index d974dfad5..35e384bfa 100644 --- a/source/exhumed/src/player.cpp +++ b/source/exhumed/src/player.cpp @@ -149,7 +149,7 @@ void PlayerInterruptKeys() CONTROL_GetInput(&info); static double lastInputTicks; - auto const currentHiTicks = timerGetHiTicks(); + auto const currentHiTicks = I_msTimeF(); double const elapsedInputTicks = currentHiTicks - lastInputTicks; lastInputTicks = currentHiTicks; diff --git a/source/sw/src/input.cpp b/source/sw/src/input.cpp index f12849d27..3a6904acc 100644 --- a/source/sw/src/input.cpp +++ b/source/sw/src/input.cpp @@ -115,7 +115,7 @@ getinput(SW_PACKET *loc, SWBOOL tied) static double lastInputTicks; - auto const currentHiTicks = timerGetHiTicks(); + auto const currentHiTicks = I_msTimeF(); elapsedInputTicks = currentHiTicks - lastInputTicks; lastInputTicks = currentHiTicks;