incidentalstoat/blankart
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix water stepup conditions

Browse source
This commit is contained in:
NepDisk 2025-03-17 11:36:03 -04:00
parent b77a66d8bb
commit b84257f2ab
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/p_map.c
View file

@ -2467,15 +2467,22 @@ BlockItReturn_t PIT_PushableMoved(mobj_t *thing)
static boolean P_WaterRunning(mobj_t *thing)
{
ffloor_t *rover = thing->floorrover;
return rover && (rover->fofflags & FOF_SWIMMABLE) &&
P_IsObjectOnGround(thing);
if (thing->player)
{
return rover && (rover->fofflags & FOF_SWIMMABLE) &&
P_IsObjectOnGround(thing) && thing->player->waterrun;
}
else
{
// Maybe move waterrun bool to mobj_t someday..?
return false;
}
}
static boolean P_WaterStepUp(mobj_t *thing)
{
player_t *player = thing->player;
return (player && player->waterskip) ||
P_WaterRunning(thing);
return P_WaterRunning(thing);
}
fixed_t P_BaseStepUp(void)