GTR_PITYSHIELD
This commit is contained in:
parent
299f2bd8cd
commit
83732f38a9
|
@ -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
|
||||||
|
|
|
@ -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,
|
||||||
};
|
};
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
@ -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.
|
||||||
|
|
Loading…
Reference in New Issue