From 65ddb6cb59b3deb90424dd25aaf89f7d9895e7a4 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Fri, 12 Jun 2020 21:08:47 +0200
Subject: [PATCH] - disabled the game side frame limiter.

The backend has its own one, and unlike the one on the game side, it actually suspends execution when waiting.
---
 source/common/rendering/v_video.cpp |  2 +-
 source/core/gamecvars.cpp           | 36 -----------------------------
 source/core/gamecvars.h             |  2 +-
 wadsrc/static/engine/menudef.txt    |  2 +-
 4 files changed, 3 insertions(+), 39 deletions(-)

diff --git a/source/common/rendering/v_video.cpp b/source/common/rendering/v_video.cpp
index ce4dab80a..2f11b86e3 100644
--- a/source/common/rendering/v_video.cpp
+++ b/source/common/rendering/v_video.cpp
@@ -78,7 +78,7 @@ CUSTOM_CVAR(Int, vid_maxfps, 200, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
 	{
 		self = GameTicRate;
 	}
-	else if (vid_maxfps > 1000)
+	else if (self > 1000)
 	{
 		self = 1000;
 	}
diff --git a/source/core/gamecvars.cpp b/source/core/gamecvars.cpp
index 48e44a329..1bee17dff 100644
--- a/source/core/gamecvars.cpp
+++ b/source/core/gamecvars.cpp
@@ -358,42 +358,6 @@ CVARD(Bool, r_shadows, true, CVAR_ARCHIVE|CVAR_GLOBALCONFIG, "enable/disable spr
 CVARD(Bool, r_rotatespritenowidescreen, false, CVAR_NOSET, "pass bit 1024 to all CON rotatesprite calls")
 CVARD(Bool, r_precache, true, CVAR_ARCHIVE|CVAR_GLOBALCONFIG, "enable/disable the pre-level caching routine")
 
-CUSTOM_CVARD(Int, r_maxfps, 200, CVAR_ARCHIVE|CVAR_GLOBALCONFIG, "limit the frame rate")
-{
-	if (self < 0) self = 0;
-	else if (self > 0 && self < 30) self = 30;
-	else if (self > 1000) self = 1000;
-}
-
-int G_FPSLimit(void)
-{
-    if (r_maxfps <= 0)
-        return 1;
-	
-	auto frameDelay = timerGetFreqU64()/(double)r_maxfps;
-
-    static double   nextPageDelay;
-    static uint64_t lastFrameTicks;
-
-    nextPageDelay = clamp(nextPageDelay, 0.0, frameDelay);
-
-    uint64_t const frameTicks   = timerGetTicksU64();
-    uint64_t const elapsedTime  = frameTicks - lastFrameTicks;
-    double const   dElapsedTime = elapsedTime;
-
-    if (dElapsedTime >= nextPageDelay)
-    {
-        if (dElapsedTime <= nextPageDelay+frameDelay)
-            nextPageDelay += frameDelay-dElapsedTime;
-
-        lastFrameTicks = frameTicks;
-
-        return 1;
-    }
-
-    return 0;
-}
-
 CUSTOM_CVARD(String, wchoice, "3457860291", CVAR_ARCHIVE | CVAR_NOINITCALL | CVAR_FRONTEND_DUKELIKE, "sets weapon autoselection order")
 {
 	char dest[11];
diff --git a/source/core/gamecvars.h b/source/core/gamecvars.h
index 128aa754c..011f96c37 100644
--- a/source/core/gamecvars.h
+++ b/source/core/gamecvars.h
@@ -119,5 +119,5 @@ extern float r_ambientlightrecip;
 extern int hud_statusbarrange;	// will be set by the game's configuration setup.
 bool G_ChangeHudLayout(int direction);
 bool G_CheckAutorun(bool button);
-int G_FPSLimit(void);
+inline int G_FPSLimit(void) { return 1; }
 bool G_AllowAutoload();
diff --git a/wadsrc/static/engine/menudef.txt b/wadsrc/static/engine/menudef.txt
index 662b0173e..e817797b1 100644
--- a/wadsrc/static/engine/menudef.txt
+++ b/wadsrc/static/engine/menudef.txt
@@ -1596,7 +1596,7 @@ OptionMenu VideoModeMenu //protected
 
 	StaticText " "
 	Option "$DSPLYMNU_VSYNC",					"vid_vsync", "OnOff"
-	Option "$VIDMNU_MAXFPS",					"r_maxfps", "MaxFps"
+	Option "$VIDMNU_MAXFPS",					"vid_maxfps", "MaxFps"
 
 	StaticText ""
 	StaticText "$VIDMNU_CUSTOMRES"