From 6f927d60c8092735b06b69a9f72059b887d111d7 Mon Sep 17 00:00:00 2001 From: Rachael Alexanderson Date: Sat, 4 Jan 2025 12:19:54 -0500 Subject: [PATCH] - don't allow `vid_dontdowait` if neither `vid_vsync` is true nor `vid_maxfps` is set, in order to prevent coil whine --- src/d_net.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/d_net.cpp b/src/d_net.cpp index f4303ff876b..d7eb63bd5bf 100644 --- a/src/d_net.cpp +++ b/src/d_net.cpp @@ -75,7 +75,9 @@ EXTERN_CVAR (Int, disableautosave) EXTERN_CVAR (Int, autosavecount) -EXTERN_CVAR(Bool, cl_capfps) +EXTERN_CVAR (Bool, cl_capfps) +EXTERN_CVAR (Bool, vid_vsync) +EXTERN_CVAR (Int, vid_maxfps) //#define SIMULATEERRORS (RAND_MAX/3) #define SIMULATEERRORS 0 @@ -1880,7 +1882,7 @@ void TryRunTics (void) bool doWait = (cl_capfps || pauseext || (r_NoInterpolate && !M_IsAnimated())); - if (vid_dontdowait) + if (vid_dontdowait && ((vid_maxfps > 0) || (vid_vsync == true))) doWait = false; // get real tics