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

Remove GTR_NOGAMEEND

Browse source
This commit is contained in:
Jaime Passos 2019-12-19 16:13:27 -03:00
parent f4bb618f93
commit 7efd9662d1
3 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/dehacked.c
View file

@ -8882,7 +8882,6 @@ static const char *const GAMETYPERULE_LIST[] = {
"EMERALDHUNT",
"SPAWNENEMIES",
"ALLOWEXIT",
"NOGAMEEND",
"NOTITLECARD",
"OVERTIME",
NULL

5
src/doomstat.h
View file

@ -414,9 +414,8 @@ enum GameTypeRules
GTR_EMERALDHUNT = 1<<22, // Emerald Hunt
GTR_SPAWNENEMIES = 1<<23, // Spawn enemies
GTR_ALLOWEXIT = 1<<24, // Allow exit sectors
GTR_NOGAMEEND = 1<<25, // Don't end the game. That is, wrap around the maps instead of starting the ending.
GTR_NOTITLECARD = 1<<26, // Don't show the title card
GTR_OVERTIME = 1<<27, // Allow overtime
GTR_NOTITLECARD = 1<<25, // Don't show the title card
GTR_OVERTIME = 1<<26, // Allow overtime
};
// String names for gametypes

6
src/g_game.c
View file

@ -3090,9 +3090,9 @@ UINT32 gametypedefaultrules[NUMGAMETYPES] =
// Co-op
GTR_CAMPAIGN|GTR_LIVES|GTR_CHASECAM|GTR_SPAWNENEMIES|GTR_ALLOWEXIT|GTR_EMERALDHUNT|GTR_EMERALDTOKENS|GTR_SPECIALSTAGES,
// Competition
GTR_RACE|GTR_LIVES|GTR_CHASECAM|GTR_SPAWNENEMIES|GTR_EMERALDTOKENS|GTR_ALLOWEXIT|GTR_NOGAMEEND,
GTR_RACE|GTR_LIVES|GTR_CHASECAM|GTR_SPAWNENEMIES|GTR_EMERALDTOKENS|GTR_ALLOWEXIT,
// Race
GTR_RACE|GTR_CHASECAM|GTR_SPAWNENEMIES|GTR_ALLOWEXIT|GTR_NOGAMEEND,
GTR_RACE|GTR_CHASECAM|GTR_SPAWNENEMIES|GTR_ALLOWEXIT,
// Match
GTR_RINGSLINGER|GTR_SPECTATORS|GTR_POINTLIMIT|GTR_TIMELIMIT|GTR_MATCHEMERALDS|GTR_PITYSHIELD|GTR_DEATHPENALTY,
@ -3583,7 +3583,7 @@ static void G_DoCompleted(void)
I_Error("Followed map %d to invalid map %d\n", prevmap + 1, nextmap + 1);
// wrap around in race
if (nextmap >= 1100-1 && nextmap <= 1102-1 && (gametyperules & GTR_NOGAMEEND))
if (nextmap >= 1100-1 && nextmap <= 1102-1 && !(gametyperules & GTR_CAMPAIGN))
nextmap = (INT16)(spstage_start-1);
if ((gottoken = ((gametyperules & GTR_SPECIALSTAGES) && token)))