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

GTR_PITYSHIELD

This commit is contained in:
Jaime Passos 2019-12-18 12:09:44 -03:00
parent 299f2bd8cd
commit 83732f38a9
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/doomstat.h
View File

@ -432,6 +432,7 @@ enum GameTypeRules
GTR_BLINDFOLDED = 1<<11, // Blindfolded view (Tag and Hide and Seek) GTR_BLINDFOLDED = 1<<11, // Blindfolded view (Tag and Hide and Seek)
GTR_EMERALDS = 1<<12, // Ringslinger emeralds (Match and CTF) GTR_EMERALDS = 1<<12, // Ringslinger emeralds (Match and CTF)
GTR_TEAMFLAGS = 1<<13, // Gametype has team flags (CTF) GTR_TEAMFLAGS = 1<<13, // Gametype has team flags (CTF)
GTR_PITYSHIELD = 1<<14, // Award pity shield
}; };
// String names for gametypes // String names for gametypes

6
src/g_game.c
View File

@ -3069,9 +3069,9 @@ INT16 gametypedefaultrules[NUMGAMETYPES] =
GTR_PLATFORM|GTR_RACE|GTR_CHASECAM, GTR_PLATFORM|GTR_RACE|GTR_CHASECAM,
// Match // Match
GTR_RINGSLINGER|GTR_SPECTATORS|GTR_TIMELIMIT|GTR_EMERALDS, GTR_RINGSLINGER|GTR_SPECTATORS|GTR_TIMELIMIT|GTR_EMERALDS|GTR_PITYSHIELD,
// Team Match // Team Match
GTR_RINGSLINGER|GTR_TEAMS|GTR_SPECTATORS|GTR_TIMELIMIT, GTR_RINGSLINGER|GTR_TEAMS|GTR_SPECTATORS|GTR_TIMELIMIT|GTR_PITYSHIELD,
// Tag // Tag
GTR_RINGSLINGER|GTR_TAG|GTR_SPECTATORS|GTR_TIMELIMIT|GTR_HIDETIME|GTR_BLINDFOLDED, GTR_RINGSLINGER|GTR_TAG|GTR_SPECTATORS|GTR_TIMELIMIT|GTR_HIDETIME|GTR_BLINDFOLDED,
@ -3079,7 +3079,7 @@ INT16 gametypedefaultrules[NUMGAMETYPES] =
GTR_RINGSLINGER|GTR_TAG|GTR_SPECTATORS|GTR_TIMELIMIT|GTR_HIDETIME|GTR_BLINDFOLDED, GTR_RINGSLINGER|GTR_TAG|GTR_SPECTATORS|GTR_TIMELIMIT|GTR_HIDETIME|GTR_BLINDFOLDED,
// CTF // CTF
GTR_RINGSLINGER|GTR_TEAMS|GTR_SPECTATORS|GTR_TIMELIMIT|GTR_EMERALDS|GTR_TEAMFLAGS, GTR_RINGSLINGER|GTR_TEAMS|GTR_SPECTATORS|GTR_TIMELIMIT|GTR_EMERALDS|GTR_TEAMFLAGS|GTR_PITYSHIELD,
}; };
// //

2
src/p_user.c
View File

@ -10539,7 +10539,7 @@ void P_DoPityCheck(player_t *player)
{ {
// No pity outside of match or CTF. // No pity outside of match or CTF.
if (player->spectator if (player->spectator
|| !(gametype == GT_MATCH || gametype == GT_TEAMMATCH || gametype == GT_CTF)) || !(gametyperules & GTR_PITYSHIELD))
return; return;
// Apply pity shield if available. // Apply pity shield if available.