From 1e61cc6152061643833ada1c720d0b07ebcdb259 Mon Sep 17 00:00:00 2001 From: Sally Cochenour Date: Mon, 28 Jan 2019 14:12:08 -0500 Subject: [PATCH] Better cpusleep - 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. --- src/d_netcmd.c | 4 ++-- src/sdl/i_system.c | 2 +- src/sdl12/i_system.c | 2 +- src/win32/win_sys.c | 2 +- src/win32ce/win_sys.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/d_netcmd.c b/src/d_netcmd.c index 41f88ab9..775f2225 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -214,7 +214,7 @@ static CV_PossibleValue_t autobalance_cons_t[] = {{0, "MIN"}, {4, "MAX"}, {0, NU 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, "Random"}, {2, "Teleports"}, {3, "None"}, {0, NULL}}; @@ -447,7 +447,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_RACE; // SRB2kart boolean forceresetplayers = false; diff --git a/src/sdl/i_system.c b/src/sdl/i_system.c index 2154a070..f360072a 100644 --- a/src/sdl/i_system.c +++ b/src/sdl/i_system.c @@ -3018,7 +3018,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/sdl12/i_system.c b/src/sdl12/i_system.c index 0e5adbb4..d055a4ca 100644 --- a/src/sdl12/i_system.c +++ b/src/sdl12/i_system.c @@ -2914,7 +2914,7 @@ void I_StartupTimer(void) void I_Sleep(void) { #if !(defined (_arch_dreamcast) || defined (_XBOX)) - if (cv_sleep.value != -1) + if (cv_sleep.value > 0) SDL_Delay(cv_sleep.value); #endif } diff --git a/src/win32/win_sys.c b/src/win32/win_sys.c index 75aca68d..fa9d6d64 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); } diff --git a/src/win32ce/win_sys.c b/src/win32ce/win_sys.c index 3b6a4725..091171b5 100644 --- a/src/win32ce/win_sys.c +++ b/src/win32ce/win_sys.c @@ -265,7 +265,7 @@ tic_t I_GetTime(void) void I_Sleep(void) { - if (cv_sleep.value != -1) + if (cv_sleep.value > 0) Sleep(cv_sleep.value); }