zdoom
/
qzdoom
mirror of https://github.com/ZDoom/qzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- fixed: The Boom stair fix was done for Hexen stairs but must only be in the code for Doom stairs. 

SVN r2162 (trunk)
This commit is contained in:
Christoph Oelckers 2010-02-14 08:24:00 +00:00
parent 8a843e4b3c
commit ea11eb9e3d
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/p_floor.cpp
View File

@ -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;
}