Merge branch 'ld-460-ringlock' into 'master'

Linedef type 460: Don't award rings while SPB-locked

Closes #205

See merge request KartKrew/Kart!536
This commit is contained in:
toaster 2022-01-20 18:36:34 +00:00
commit 334d25d3ab

View file

@ -3620,6 +3620,10 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
INT32 delay = (sides[line->sidenum[0]].rowoffset>>FRACBITS); INT32 delay = (sides[line->sidenum[0]].rowoffset>>FRACBITS);
if (mo && mo->player) if (mo && mo->player)
{ {
// Don't award rings while SPB is targetting you
if (mo->player->pflags & PF_RINGLOCK)
return;
if (delay <= 0 || !(leveltime % delay)) if (delay <= 0 || !(leveltime % delay))
P_GivePlayerRings(mo->player, rings); P_GivePlayerRings(mo->player, rings);
} }