stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2025-01-13 21:31:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

Per Sal's request (slightly modified):

Browse source 
* Do not allow any joining spectators if anybody got onto the last lap while not in FREE PLAY (this is the same condition as nospectategrief, for consistency).
* Reset nospectategrief to 0 if there is literally nobody playing, to prevent a fully locked-out server.
* This means it's not a problem to reset spectatorreentry even with the map command.
* Change the default for spectatorreentry to 30 seconds, from 60.
This commit is contained in:
toaster 2021-12-15 17:28:31 +00:00
parent 19ac63bd6c
commit d398698729
3 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/d_netcmd.c
View file

@ -248,7 +248,7 @@ static CV_PossibleValue_t ingamecap_cons_t[] = {{0, "MIN"}, {MAXPLAYERS-1, "MAX"
consvar_t cv_ingamecap = {"ingamecap", "0", CV_NETVAR, ingamecap_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
static CV_PossibleValue_t spectatorreentry_cons_t[] = {{0, "MIN"}, {10*60, "MAX"}, {0, NULL}};
consvar_t cv_spectatorreentry = {"spectatorreentry", "60", CV_NETVAR, spectatorreentry_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_spectatorreentry = {"spectatorreentry", "30", CV_NETVAR, spectatorreentry_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
static CV_PossibleValue_t antigrief_cons_t[] = {{20, "MIN"}, {60, "MAX"}, {0, "Off"}, {0, NULL}};
consvar_t cv_antigrief = {"antigrief", "30", CV_NETVAR, antigrief_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};

6
src/k_kart.c
View file

@ -6339,6 +6339,12 @@ void K_CheckSpectateStatus(void)
if (!numjoiners)
return;
// 1.4: prevent last lap jerkitude
if (!numingame) // but allow empty netgames to recover
nospectategrief = 0;
if (nospectategrief > 1)
return;
// Organize by spectate wait timer
#if 0
if (cv_ingamecap.value)

2
src/p_setup.c
View file

@ -2396,6 +2396,8 @@ static void P_LevelInitStuff(void)
players[i].exiting = 0;
P_ResetPlayer(&players[i]);
players[i].spectatorreentry = 0; // SRB2Kart 1.4
players[i].mo = NULL;
// we must unset axis details too