From c92a371aa97c99cb4c0d5f03186987a83de462f9 Mon Sep 17 00:00:00 2001
From: spherallic <spherallic@gmail.com>
Date: Sat, 8 Oct 2022 10:58:09 +0200
Subject: [PATCH] Clean up the start of P_CheckQuicksand
---
src/p_user.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/p_user.c b/src/p_user.c
index 06249d9ffd..59ede2e628 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -2814,14 +2814,13 @@ static void P_CheckQuicksand(player_t *player)
fixed_t sinkspeed;
fixed_t topheight, bottomheight;
- if (!(player->mo->subsector->sector->ffloors &&
- ((!(player->mo->eflags & MFE_VERTICALFLIP) && player->mo->momz <= 0) ||
- (player->mo->eflags & MFE_VERTICALFLIP && player->mo->momz >= 0))))
+ if (!(player->mo->subsector->sector->ffloors && P_MobjFlip(player->mo)*player->mo->momz <= 0))
return;
for (rover = player->mo->subsector->sector->ffloors; rover; rover = rover->next)
{
- if (!(rover->fofflags & FOF_EXISTS)) continue;
+ if (!(rover->fofflags & FOF_EXISTS))
+ continue;
if (!(rover->fofflags & FOF_QUICKSAND))
continue;
--
GitLab