stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-12-27 04:41:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into offroad-stuff

Browse source
This commit is contained in:
Sally Cochenour 2019-01-29 20:22:15 -05:00
commit 70a70b8a97
7 changed files with 17 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/d_netcmd.c
View file

@ -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 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 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"}, static CV_PossibleValue_t competitionboxes_cons_t[] = {{0, "Normal"}, {1, "Random"}, {2, "Teleports"},
{3, "None"}, {0, NULL}}; {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_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_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 INT16 gametype = GT_RACE; // SRB2kart
boolean forceresetplayers = false; boolean forceresetplayers = false;

12
src/k_kart.c
View file

@ -7111,16 +7111,12 @@ void HU_DrawTabRankings(INT32 x, INT32 y, playersort_t *tab, INT32 scorelines, I
&& tab[i].num != serverplayer) && tab[i].num != serverplayer)
HU_drawPing(x + ((i < 8) ? -19 : rightoffset + 13), y+2, playerpingtable[tab[i].num], false); HU_drawPing(x + ((i < 8) ? -19 : rightoffset + 13), y+2, playerpingtable[tab[i].num], false);
if (scorelines > 8)
strlcpy(strtime, tab[i].name, 6);
else
STRBUFCPY(strtime, tab[i].name); STRBUFCPY(strtime, tab[i].name);
V_DrawString(x + 20, y, if (scorelines > 8)
((tab[i].num == whiteplayer) V_DrawThinString(x + 20, y, ((tab[i].num == whiteplayer) ? hilicol : 0)|V_ALLOWLOWERCASE|V_6WIDTHSPACE, strtime);
? hilicol|V_ALLOWLOWERCASE else
: V_ALLOWLOWERCASE), V_DrawString(x + 20, y, ((tab[i].num == whiteplayer) ? hilicol : 0)|V_ALLOWLOWERCASE, strtime);
strtime);
if (players[tab[i].num].mo->color) if (players[tab[i].num].mo->color)
{ {

2
src/sdl/i_system.c
View file

@ -3018,7 +3018,7 @@ void I_StartupTimer(void)
void I_Sleep(void) void I_Sleep(void)
{ {
if (cv_sleep.value != -1) if (cv_sleep.value > 0)
SDL_Delay(cv_sleep.value); SDL_Delay(cv_sleep.value);
} }

2
src/sdl12/i_system.c
View file

@ -2914,7 +2914,7 @@ void I_StartupTimer(void)
void I_Sleep(void) void I_Sleep(void)
{ {
#if !(defined (_arch_dreamcast) || defined (_XBOX)) #if !(defined (_arch_dreamcast) || defined (_XBOX))
if (cv_sleep.value != -1) if (cv_sleep.value > 0)
SDL_Delay(cv_sleep.value); SDL_Delay(cv_sleep.value);
#endif #endif
} }

2
src/win32/win_sys.c
View file

@ -261,7 +261,7 @@ tic_t I_GetTime(void)
void I_Sleep(void) void I_Sleep(void)
{ {
if (cv_sleep.value != -1) if (cv_sleep.value > 0)
Sleep(cv_sleep.value); Sleep(cv_sleep.value);
} }

2
src/win32ce/win_sys.c
View file

@ -265,7 +265,7 @@ tic_t I_GetTime(void)
void I_Sleep(void) void I_Sleep(void)
{ {
if (cv_sleep.value != -1) if (cv_sleep.value > 0)
Sleep(cv_sleep.value); Sleep(cv_sleep.value);
} }

12
src/y_inter.c
View file

@ -474,16 +474,12 @@ void Y_IntermissionDrawer(void)
V_DrawScaledPatch(x+16, y-4, 0, W_CachePatchName(va("K_CHILI%d", cursorframe+1), PU_CACHE)); V_DrawScaledPatch(x+16, y-4, 0, W_CachePatchName(va("K_CHILI%d", cursorframe+1), PU_CACHE));
} }
if (!gutter)
strlcpy(strtime, data.match.name[i], 6);
else
STRBUFCPY(strtime, data.match.name[i]); STRBUFCPY(strtime, data.match.name[i]);
V_DrawString(x+36, y, if (!gutter)
((data.match.num[i] == whiteplayer) V_DrawThinString(x+36, y, ((data.match.num[i] == whiteplayer) ? hilicol : 0)|V_ALLOWLOWERCASE|V_6WIDTHSPACE, strtime);
? hilicol|V_ALLOWLOWERCASE else
: V_ALLOWLOWERCASE), V_DrawString(x+36, y, ((data.match.num[i] == whiteplayer) ? hilicol : 0)|V_ALLOWLOWERCASE, strtime);
strtime);
if (data.match.rankingsmode) if (data.match.rankingsmode)
{ {