lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Race is Competition without the lives

This commit is contained in:
Jaime Passos 2020-02-28 23:47:38 -03:00
parent fd062308fe
commit d3ed5ad44f
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/d_netcmd.c
View File

@ -3629,7 +3629,7 @@ static void PointLimit_OnChange(void)
static void NumLaps_OnChange(void) static void NumLaps_OnChange(void)
{ {
// Just don't be verbose // Just don't be verbose
if (gametype == GT_RACE) if ((gametyperules & (GTR_RACE|GTR_LIVES)) == GTR_RACE)
CONS_Printf(M_GetText("Number of laps set to %d\n"), cv_numlaps.value); CONS_Printf(M_GetText("Number of laps set to %d\n"), cv_numlaps.value);
} }
@ -4608,7 +4608,7 @@ static void Command_ShowTime_f(void)
static void BaseNumLaps_OnChange(void) static void BaseNumLaps_OnChange(void)
{ {
if (gametype == GT_RACE) if ((gametyperules & (GTR_RACE|GTR_LIVES)) == GTR_RACE)
{ {
if (cv_basenumlaps.value) if (cv_basenumlaps.value)
CONS_Printf(M_GetText("Number of laps will be changed to map defaults next round.\n")); CONS_Printf(M_GetText("Number of laps will be changed to map defaults next round.\n"));

2
src/p_setup.c
View File

@ -3374,7 +3374,7 @@ static void P_InitGametype(void)
if (G_TagGametype()) if (G_TagGametype())
P_InitTagGametype(); P_InitTagGametype();
else if (gametype == GT_RACE && server) else if (((gametyperules & (GTR_RACE|GTR_LIVES)) == GTR_RACE) && server)
CV_StealthSetValue(&cv_numlaps, CV_StealthSetValue(&cv_numlaps,
(cv_basenumlaps.value) (cv_basenumlaps.value)
? cv_basenumlaps.value ? cv_basenumlaps.value

4
src/p_spec.c
View File

@ -4991,7 +4991,7 @@ DoneSection2:
break; break;
case 10: // Finish Line case 10: // Finish Line
if (gametype == GT_RACE && !player->exiting) if (((gametyperules & (GTR_RACE|GTR_LIVES)) == GTR_RACE) && !player->exiting)
{ {
if (player->starpostnum == numstarposts) // Must have touched all the starposts if (player->starpostnum == numstarposts) // Must have touched all the starposts
{ {
@ -6483,7 +6483,7 @@ void P_SpawnSpecials(boolean fromnetsave)
switch(GETSECSPECIAL(sector->special, 4)) switch(GETSECSPECIAL(sector->special, 4))
{ {
case 10: // Circuit finish line case 10: // Circuit finish line
if (gametype == GT_RACE) if ((gametyperules & (GTR_RACE|GTR_LIVES)) == GTR_RACE)
circuitmap = true; circuitmap = true;
break; break;
} }

2
src/st_stuff.c
View File

@ -2688,7 +2688,7 @@ static void ST_overlayDrawer(void)
&& (netgame || multiplayer) && (netgame || multiplayer)
&& (cv_cooplives.value == 0)) && (cv_cooplives.value == 0))
; ;
else if ((G_GametypeUsesLives() || gametype == GT_RACE) && stplyr->lives <= 0 && !(hu_showscores && (netgame || multiplayer))) else if ((G_GametypeUsesLives() || ((gametyperules & (GTR_RACE|GTR_LIVES)) == GTR_RACE)) && stplyr->lives <= 0 && !(hu_showscores && (netgame || multiplayer)))
{ {
INT32 i = MAXPLAYERS; INT32 i = MAXPLAYERS;
INT32 deadtimer = stplyr->spectator ? TICRATE : (stplyr->deadtimer-(TICRATE<<1)); INT32 deadtimer = stplyr->spectator ? TICRATE : (stplyr->deadtimer-(TICRATE<<1));