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

Remove GTR_ROUNDENDMESSAGE

Browse source
This commit is contained in:
Jaime Passos 2019-12-19 15:47:37 -03:00
parent ce0e4201b8
commit 768080977f
3 changed files with 12 additions and 14 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[] = {
"ALLOWEXIT",
"CAMPAIGN",
"NOGAMEEND",
"ROUNDENDMESSAGE",
"NOTITLECARD",
"POINTLIMIT",
"TIMELIMIT",

9
src/doomstat.h
View file

@ -419,11 +419,10 @@ enum GameTypeRules
GTR_ALLOWEXIT = 1<<22, // Allow exit sectors
GTR_CAMPAIGN = 1<<23, // Linear Co-op map progression. Don't allow random maps.
GTR_NOGAMEEND = 1<<24, // Don't end the game. That is, wrap around the maps instead of starting the ending.
GTR_ROUNDENDMESSAGE = 1<<25, // Prints "The round has ended." into the console
GTR_NOTITLECARD = 1<<26, // Don't show the title card
GTR_POINTLIMIT = 1<<27, // Ringslinger point limit
GTR_TIMELIMIT = 1<<28, // Ringslinger time limit
GTR_OVERTIME = 1<<29, // Allow overtime
GTR_NOTITLECARD = 1<<25, // Don't show the title card
GTR_POINTLIMIT = 1<<26, // Ringslinger point limit
GTR_TIMELIMIT = 1<<27, // Ringslinger time limit
GTR_OVERTIME = 1<<28, // Allow overtime
};
// String names for gametypes

16
src/g_game.c
View file

@ -3036,7 +3036,7 @@ void G_ExitLevel(void)
CV_SetValue(&cv_teamscramble, cv_scrambleonchange.value);
}
if (gametyperules & GTR_ROUNDENDMESSAGE)
if (!(gametyperules & GTR_CAMPAIGN))
CONS_Printf(M_GetText("The round has ended.\n"));
// Remove CEcho text on round end.
@ -3090,22 +3090,22 @@ UINT32 gametypedefaultrules[NUMGAMETYPES] =
// Co-op
GTR_PLATFORM|GTR_CAMPAIGN|GTR_LIVES|GTR_CHASECAM|GTR_EMERALDHUNT|GTR_SPAWNENEMIES|GTR_ALLOWEXIT|GTR_EMERALDTOKENS|GTR_SPECIALSTAGES,
// Competition
GTR_PLATFORM|GTR_NOGAMEEND|GTR_LIVES|GTR_RACE|GTR_CHASECAM|GTR_SPAWNENEMIES|GTR_ALLOWEXIT|GTR_ROUNDENDMESSAGE|GTR_EMERALDTOKENS,
GTR_PLATFORM|GTR_NOGAMEEND|GTR_LIVES|GTR_RACE|GTR_CHASECAM|GTR_SPAWNENEMIES|GTR_ALLOWEXIT|GTR_EMERALDTOKENS,
// Race
GTR_PLATFORM|GTR_NOGAMEEND|GTR_RACE|GTR_CHASECAM|GTR_SPAWNENEMIES|GTR_ALLOWEXIT|GTR_ROUNDENDMESSAGE,
GTR_PLATFORM|GTR_NOGAMEEND|GTR_RACE|GTR_CHASECAM|GTR_SPAWNENEMIES|GTR_ALLOWEXIT,
// Match
GTR_RINGSLINGER|GTR_SPECTATORS|GTR_POINTLIMIT|GTR_TIMELIMIT|GTR_EMERALDS|GTR_PITYSHIELD|GTR_DEATHPENALTY|GTR_ROUNDENDMESSAGE,
GTR_RINGSLINGER|GTR_SPECTATORS|GTR_POINTLIMIT|GTR_TIMELIMIT|GTR_EMERALDS|GTR_PITYSHIELD|GTR_DEATHPENALTY,
// Team Match
GTR_RINGSLINGER|GTR_SPECTATORS|GTR_TEAMS|GTR_POINTLIMIT|GTR_TIMELIMIT|GTR_PITYSHIELD|GTR_ROUNDENDMESSAGE,
GTR_RINGSLINGER|GTR_SPECTATORS|GTR_TEAMS|GTR_POINTLIMIT|GTR_TIMELIMIT|GTR_PITYSHIELD,
// Tag
GTR_RINGSLINGER|GTR_TAG|GTR_SPECTATORS|GTR_POINTLIMIT|GTR_TIMELIMIT|GTR_HIDETIME|GTR_BLINDFOLDED|GTR_ROUNDENDMESSAGE,
GTR_RINGSLINGER|GTR_TAG|GTR_SPECTATORS|GTR_POINTLIMIT|GTR_TIMELIMIT|GTR_HIDETIME|GTR_BLINDFOLDED,
// Hide and Seek
GTR_RINGSLINGER|GTR_TAG|GTR_SPECTATORS|GTR_POINTLIMIT|GTR_TIMELIMIT|GTR_HIDETIME|GTR_BLINDFOLDED|GTR_ROUNDENDMESSAGE,
GTR_RINGSLINGER|GTR_TAG|GTR_SPECTATORS|GTR_POINTLIMIT|GTR_TIMELIMIT|GTR_HIDETIME|GTR_BLINDFOLDED,
// CTF
GTR_RINGSLINGER|GTR_SPECTATORS|GTR_TEAMS|GTR_POINTLIMIT|GTR_TIMELIMIT|GTR_EMERALDS|GTR_TEAMFLAGS|GTR_PITYSHIELD|GTR_ROUNDENDMESSAGE,
GTR_RINGSLINGER|GTR_SPECTATORS|GTR_TEAMS|GTR_POINTLIMIT|GTR_TIMELIMIT|GTR_EMERALDS|GTR_TEAMFLAGS|GTR_PITYSHIELD,
};
//