thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'fix-antigrief-all-spectators' into 'master'

Browse source 
Ignore no-contest antigrief if no humans left

Closes #1018

See merge request KartKrew/Kart!1927
This commit is contained in:
Oni 2024-02-18 03:51:09 +00:00
commit 77ffc08444
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/p_inter.c
View file

@ -1505,7 +1505,7 @@ boolean P_CheckRacers(void)
} }
else else
{ {
if (griefed == true) if (griefed == true && numHumans > 0)
{ {
// Don't do this if someone spectated // Don't do this if someone spectated
eliminateLast = false; eliminateLast = false;
@ -2503,7 +2503,7 @@ static boolean P_KillPlayer(player_t *player, mobj_t *inflictor, mobj_t *source,
if (gametyperules & (GTR_BUMPERS|GTR_CHECKPOINTS)) if (gametyperules & (GTR_BUMPERS|GTR_CHECKPOINTS))
{ {
if ((player->pitblame > -1) && (player->pitblame < MAXPLAYERS) if ((player->pitblame > -1) && (player->pitblame < MAXPLAYERS)
&& (playeringame[player->pitblame]) && (!players[player->pitblame].spectator) && (playeringame[player->pitblame]) && (!players[player->pitblame].spectator)
&& (players[player->pitblame].mo) && (!P_MobjWasRemoved(players[player->pitblame].mo))) && (players[player->pitblame].mo) && (!P_MobjWasRemoved(players[player->pitblame].mo)))
{ {
P_DamageMobj(player->mo, players[player->pitblame].mo, players[player->pitblame].mo, 1, DMG_KARMA); P_DamageMobj(player->mo, players[player->pitblame].mo, players[player->pitblame].mo, 1, DMG_KARMA);