lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix Mario block triggering during ghost fade

This commit is contained in:
mazmazz 2018-09-08 01:12:34 -04:00
parent 4147773d0c
commit 66dc84509a
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/p_spec.c
View File

@ -7485,6 +7485,8 @@ static boolean P_FadeFakeFloor(ffloor_t *rover, INT16 destvalue, INT16 speed,
rover->flags &= ~FF_QUICKSAND;
if (rover->spawnflags & FF_BUSTUP)
rover->flags &= ~FF_BUSTUP;
if (rover->spawnflags & FF_MARIO)
rover->flags &= ~FF_MARIO;
}
}
else // continue fading out
@ -7510,6 +7512,8 @@ static boolean P_FadeFakeFloor(ffloor_t *rover, INT16 destvalue, INT16 speed,
rover->flags |= FF_QUICKSAND;
if (rover->spawnflags & FF_BUSTUP)
rover->flags |= FF_BUSTUP;
if (rover->spawnflags & FF_MARIO)
rover->flags |= FF_MARIO;
}
}
else // continue fading in
@ -7567,6 +7571,8 @@ static boolean P_FadeFakeFloor(ffloor_t *rover, INT16 destvalue, INT16 speed,
rover->flags &= ~FF_QUICKSAND;
if (rover->spawnflags & FF_BUSTUP)
rover->flags &= ~FF_BUSTUP;
if (rover->spawnflags & FF_MARIO)
rover->flags &= ~FF_MARIO;
}
else // keep collision during fade
{
@ -7578,6 +7584,8 @@ static boolean P_FadeFakeFloor(ffloor_t *rover, INT16 destvalue, INT16 speed,
rover->flags |= FF_QUICKSAND;
if (rover->spawnflags & FF_BUSTUP)
rover->flags |= FF_BUSTUP;
if (rover->spawnflags & FF_MARIO)
rover->flags |= FF_MARIO;
}
}
}