From 56233342833ebc91d11bc675ef537e2e1e6b0fd9 Mon Sep 17 00:00:00 2001 From: helixhorned Date: Fri, 11 Nov 2011 22:39:56 +0000 Subject: [PATCH] Correct thinko with the ceiling/floor movement code. When moving more than one sector c/f and moving one of them would go beyond the other side (ceilingz > floorz), don't move any sector c/f at all. When moving only one sector in that case, move so that ceilingz == floorz. git-svn-id: https://svn.eduke32.com/eduke32@2112 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/source/astub.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/polymer/eduke32/source/astub.c b/polymer/eduke32/source/astub.c index 9c8591268..25a259e23 100644 --- a/polymer/eduke32/source/astub.c +++ b/polymer/eduke32/source/astub.c @@ -5902,9 +5902,9 @@ static void Keys3d(void) // (ceiling if floor and vice versa) if (moveCeilings && (dz > 0) && sector[sect].ceilingz+dz > sector[sect].floorz) - dz = (k<=1) ? 0 : min(sector[sect].floorz - sector[sect].ceilingz, dz); + dz = (k > 1) ? 0 : min(sector[sect].floorz - sector[sect].ceilingz, dz); else if (moveFloors && (dz < 0) && sector[sect].floorz+dz < sector[sect].ceilingz) - dz = (k<=1) ? 0 : max(sector[sect].ceilingz - sector[sect].floorz, dz); + dz = (k > 1) ? 0 : max(sector[sect].ceilingz - sector[sect].floorz, dz); if (dz == 0) break;