stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-18 02:21:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix Mario block triggering during ghost fade

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