Merge branch 'issue1195' of https://git.do.srb2.org/SSNTails/SRB2 into issue1195

This commit is contained in:
Arthur 2024-02-27 07:12:26 -05:00
commit 2da539ed9f

View file

@ -1740,7 +1740,7 @@ static unsigned PIT_DoCheckThing(mobj_t *thing)
unsigned collide = CHECKTHING_NOCOLLIDE;
if ((tmthing->flags & MF_SPRING || tmthing->type == MT_SPIKE || tmthing->type == MT_WALLSPIKE) && (thing->player))
; // springs should never be able to step up onto a player
; // springs and spikes should never be able to step up onto a player
// z checking at last
// Treat noclip things as non-solid!
else if ((thing->flags & (MF_SOLID|MF_NOCLIP)) == MF_SOLID