From ea11eb9e3d2764bd4980e76f0c8ab827c777977d Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 14 Feb 2010 08:24:00 +0000 Subject: [PATCH] - fixed: The Boom stair fix was done for Hexen stairs but must only be in the code for Doom stairs. SVN r2162 (trunk) --- src/p_floor.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/p_floor.cpp b/src/p_floor.cpp index a03b50583..00407a36c 100644 --- a/src/p_floor.cpp +++ b/src/p_floor.cpp @@ -663,9 +663,7 @@ manual_stair: if ( (ok = (tsec != NULL)) ) { - // Doom bug: Height was changed before discarding the sector as part of the stairs. - // Needs to be compatibility optioned because some maps (Eternall MAP25) depend on it. - if (i_compatflags & COMPATF_STAIRINDEX) height += stairstep; + height += stairstep; // if sector's floor already moving, look for another //jff 2/26/98 special lockout condition for retriggering @@ -676,8 +674,6 @@ manual_stair: continue; } - if (!(i_compatflags & COMPATF_STAIRINDEX)) height += stairstep; - } newsecnum = (int)(tsec - sectors); } @@ -701,13 +697,17 @@ manual_stair: if (!igntxt && tsec->GetTexture(sector_t::floor) != texture) continue; - height += stairstep; + // Doom bug: Height was changed before discarding the sector as part of the stairs. + // Needs to be compatibility optioned because some maps (Eternall MAP25) depend on it. + if (i_compatflags & COMPATF_STAIRINDEX) height += stairstep; // if sector's floor already moving, look for another //jff 2/26/98 special lockout condition for retriggering if (tsec->PlaneMoving(sector_t::floor) || tsec->stairlock) continue; + if (!(i_compatflags & COMPATF_STAIRINDEX)) height += stairstep; + ok = true; break; }