From 0350262a0fc9fbced8d23003cad4bccc2cc16c29 Mon Sep 17 00:00:00 2001 From: toaster Date: Sun, 13 Oct 2019 13:12:07 +0100 Subject: [PATCH] On the recommendation of Sryder, revert everything relating to the `cpusleep` changes except for the new default value of 1. --- src/d_netcmd.c | 2 +- src/sdl/i_system.c | 2 +- src/win32/win_sys.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/d_netcmd.c b/src/d_netcmd.c index 3e9a37078..597c05d09 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[] = {{0, "MIN"}, {1000/TICRATE, "MAX"}, {0, NULL}}; +static CV_PossibleValue_t sleeping_cons_t[] = {{-1, "MIN"}, {1000/TICRATE, "MAX"}, {0, NULL}}; static CV_PossibleValue_t competitionboxes_cons_t[] = {{0, "Normal"}, {1, "Mystery"}, //{2, "Teleport"}, {3, "None"}, {0, NULL}}; diff --git a/src/sdl/i_system.c b/src/sdl/i_system.c index 461652b67..d7926e5b2 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 > 0) + if (cv_sleep.value != -1) SDL_Delay(cv_sleep.value); } diff --git a/src/win32/win_sys.c b/src/win32/win_sys.c index 0e2deea1d..93b3ff523 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 > 0) + if (cv_sleep.value != -1) Sleep(cv_sleep.value); }