Merge branch 'linespecial-fixes-jug' into 'next'

Delayable linedefs crash fix

See merge request KartKrew/Kart-Public!269
This commit is contained in:
Sal 2021-09-12 00:09:15 +00:00
commit 520b1f2a75

View file

@ -2879,7 +2879,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
break; break;
case 432: // Enable 2D Mode (Disable if noclimb) case 432: // Enable 2D Mode (Disable if noclimb)
if (mo->player) if (mo && mo->player)
{ {
if (line->flags & ML_NOCLIMB) if (line->flags & ML_NOCLIMB)
mo->flags2 &= ~MF2_TWOD; mo->flags2 &= ~MF2_TWOD;
@ -2905,7 +2905,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
break; break;
case 434: // Custom Power case 434: // Custom Power
if (mo->player) if (mo && mo->player)
{ {
mobj_t *dummy = P_SpawnMobj(mo->x, mo->y, mo->z, MT_NULL); mobj_t *dummy = P_SpawnMobj(mo->x, mo->y, mo->z, MT_NULL);
@ -2985,7 +2985,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
break; break;
case 437: // Disable Player Controls case 437: // Disable Player Controls
if (mo->player) if (mo && mo->player)
{ {
UINT16 fractime = (UINT16)(sides[line->sidenum[0]].textureoffset>>FRACBITS); UINT16 fractime = (UINT16)(sides[line->sidenum[0]].textureoffset>>FRACBITS);
if (fractime < 1) if (fractime < 1)