From 12b4f68f245aa2d6df658cb3efd6bbc564751db9 Mon Sep 17 00:00:00 2001 From: Mitchell Richters Date: Sat, 25 Mar 2023 18:49:22 +1100 Subject: [PATCH] - Exhumed: Directly inline interpfrac test into `gi->Render()`. --- source/games/exhumed/src/exhumed.cpp | 5 ----- source/games/exhumed/src/gameloop.cpp | 9 ++------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/source/games/exhumed/src/exhumed.cpp b/source/games/exhumed/src/exhumed.cpp index 2512c0e22..b0399614f 100644 --- a/source/games/exhumed/src/exhumed.cpp +++ b/source/games/exhumed/src/exhumed.cpp @@ -262,11 +262,6 @@ void DrawClock() // //--------------------------------------------------------------------------- -double calc_interpfrac() -{ - return bRecord || bPlayback || nFreeze != 0 || paused || cl_capfps || !cl_interpolate || EndLevel ? 1. : I_GetTimeFrac(); -} - void DoGameOverScene(bool finallevel) { // todo: make these customizable later. diff --git a/source/games/exhumed/src/gameloop.cpp b/source/games/exhumed/src/gameloop.cpp index 4efa90642..c74fb76fd 100644 --- a/source/games/exhumed/src/gameloop.cpp +++ b/source/games/exhumed/src/gameloop.cpp @@ -55,11 +55,8 @@ int nBestLevel; void RunCinemaScene(int num); void DrawClock(); -double calc_interpfrac(); void DoTitle(CompletionFunc completion); - - //--------------------------------------------------------------------------- // // @@ -77,11 +74,9 @@ void GameInterface::Render() DrawClock(); } - double const interpfrac = calc_interpfrac(); - - - + const double interpfrac = bRecord || bPlayback || nFreeze != 0 || paused || cl_capfps || !cl_interpolate || EndLevel ? 1. : I_GetTimeFrac(); DrawView(interpfrac); + if (nFreeze != 2) // Hide when Ramses is talking. { DrawStatusBar();