From 9ca227237aec17fd46e764a2300645ef23cb63dc Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Sun, 13 Oct 2019 12:05:12 +0100
Subject: [PATCH] Better cpusleep command. Sal said it better than I can, so in
her words:
* Default to 1, which means potential for a 1-frame loss every once in a while but no longer a complete cpu hog
* New minimum is 0, since -1 just did the exact same thing as 0 except slightly more optimized.
---
src/d_netcmd.c | 4 ++--
src/sdl/i_system.c | 2 +-
src/win32/win_sys.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index bd57c24810..3e9a370788 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -187,7 +187,7 @@ static CV_PossibleValue_t joyport_cons_t[] = {{1, "/dev/js0"}, {2, "/dev/js1"},
static CV_PossibleValue_t teamscramble_cons_t[] = {{0, "Off"}, {1, "Random"}, {2, "Points"}, {0, NULL}};
static CV_PossibleValue_t startingliveslimit_cons_t[] = {{1, "MIN"}, {99, "MAX"}, {0, NULL}};
-static CV_PossibleValue_t sleeping_cons_t[] = {{-1, "MIN"}, {1000/TICRATE, "MAX"}, {0, NULL}};
+static CV_PossibleValue_t sleeping_cons_t[] = {{0, "MIN"}, {1000/TICRATE, "MAX"}, {0, NULL}};
static CV_PossibleValue_t competitionboxes_cons_t[] = {{0, "Normal"}, {1, "Mystery"}, //{2, "Teleport"},
{3, "None"}, {0, NULL}};
@@ -363,7 +363,7 @@ consvar_t cv_runscripts = {"runscripts", "Yes", 0, CV_YesNo, NULL, 0, NULL, NULL
consvar_t cv_pause = {"pausepermission", "Server", CV_NETVAR, pause_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_mute = {"mute", "Off", CV_NETVAR|CV_CALL, CV_OnOff, Mute_OnChange, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_sleep = {"cpusleep", "-1", CV_SAVE, sleeping_cons_t, NULL, -1, NULL, NULL, 0, 0, NULL};
+consvar_t cv_sleep = {"cpusleep", "1", CV_SAVE, sleeping_cons_t, NULL, -1, NULL, NULL, 0, 0, NULL};
INT16 gametype = GT_COOP;
boolean splitscreen = false;
diff --git a/src/sdl/i_system.c b/src/sdl/i_system.c
index d7926e5b2e..461652b677 100644
--- a/src/sdl/i_system.c
+++ b/src/sdl/i_system.c
@@ -2135,7 +2135,7 @@ void I_StartupTimer(void)
void I_Sleep(void)
{
- if (cv_sleep.value != -1)
+ if (cv_sleep.value > 0)
SDL_Delay(cv_sleep.value);
}
diff --git a/src/win32/win_sys.c b/src/win32/win_sys.c
index 93b3ff5238..0e2deea1d8 100644
--- a/src/win32/win_sys.c
+++ b/src/win32/win_sys.c
@@ -261,7 +261,7 @@ tic_t I_GetTime(void)
void I_Sleep(void)
{
- if (cv_sleep.value != -1)
+ if (cv_sleep.value > 0)
Sleep(cv_sleep.value);
}
--
GitLab