From ed25fefcaeed165008a56965a0931c2bf637966f Mon Sep 17 00:00:00 2001
From: Monster Iestyn <iestynjealous@ntlworld.com>
Date: Sun, 24 May 2020 21:15:31 +0100
Subject: [PATCH] T_BounceCheese: Fix FOF height desync occurring if the FOF
fell down too fast (resulting in a bizarre bouncing back up effect in MP SS5
due to P_FloorzAtPos messing up as a result)
---
src/p_floor.c | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/src/p_floor.c b/src/p_floor.c
index ee673cb047..a0f7edd9ca 100644
--- a/src/p_floor.c
+++ b/src/p_floor.c
@@ -696,10 +696,20 @@ void T_BounceCheese(bouncecheese_t *bouncer)
return;
}
- T_MovePlane(bouncer->sector, bouncer->speed/2, bouncer->sector->ceilingheight -
- 70*FRACUNIT, false, true, -1); // move ceiling
- T_MovePlane(bouncer->sector, bouncer->speed/2, bouncer->sector->floorheight - 70*FRACUNIT,
- false, false, -1); // move floor
+ if (bouncer->speed >= 0) // move floor first to fix height desync and any bizarre bugs following that
+ {
+ T_MovePlane(bouncer->sector, bouncer->speed/2, bouncer->sector->floorheight - 70*FRACUNIT,
+ false, false, -1); // move floor
+ T_MovePlane(bouncer->sector, bouncer->speed/2, bouncer->sector->ceilingheight -
+ 70*FRACUNIT, false, true, -1); // move ceiling
+ }
+ else
+ {
+ T_MovePlane(bouncer->sector, bouncer->speed/2, bouncer->sector->ceilingheight -
+ 70*FRACUNIT, false, true, -1); // move ceiling
+ T_MovePlane(bouncer->sector, bouncer->speed/2, bouncer->sector->floorheight - 70*FRACUNIT,
+ false, false, -1); // move floor
+ }
bouncer->sector->floorspeed = -bouncer->speed/2;
bouncer->sector->ceilspeed = 42;
--
GitLab