diff options
author | Samuel Villareal | 2010-09-14 06:24:04 +0000 |
---|---|---|
committer | Samuel Villareal | 2010-09-14 06:24:04 +0000 |
commit | 4c9a85fa61a4298b342a76d4ac128c036b199055 (patch) | |
tree | bca7f6080188f6bd484573ddbfadefa1a5821df6 /src/strife/p_floor.c | |
parent | fe531d051d66611d82c233f8a02b435bece34ab6 (diff) | |
download | chocolate-doom-4c9a85fa61a4298b342a76d4ac128c036b199055.tar.gz chocolate-doom-4c9a85fa61a4298b342a76d4ac128c036b199055.tar.bz2 chocolate-doom-4c9a85fa61a4298b342a76d4ac128c036b199055.zip |
+ P_FindSlidingDoorType fixed where it was returning a null slidetype
+ EV_SlideDoor updated
+ Linetypes 207 (RemoteSlideDoor) and linetype 229 (Sigil SlideDoor)
added
+ T_MovePlane updated
Subversion-branch: /branches/strife-branch
Subversion-revision: 2085
Diffstat (limited to 'src/strife/p_floor.c')
-rw-r--r-- | src/strife/p_floor.c | 54 |
1 files changed, 31 insertions, 23 deletions
diff --git a/src/strife/p_floor.c b/src/strife/p_floor.c index edeb44a1..8f434fe6 100644 --- a/src/strife/p_floor.c +++ b/src/strife/p_floor.c @@ -68,28 +68,35 @@ T_MovePlane // DOWN if (sector->floorheight - speed < dest) { - lastpos = sector->floorheight; + // villsa [STRIFE] unused + //lastpos = sector->floorheight; sector->floorheight = dest; flag = P_ChangeSector(sector,crush); - if (flag == true) + + // villsa [STRIFE] unused + /*if (flag == true) { sector->floorheight =lastpos; P_ChangeSector(sector,crush); //return crushed; - } + }*/ return pastdest; } else { - lastpos = sector->floorheight; + // villsa [STRIFE] unused + //lastpos = sector->floorheight; sector->floorheight -= speed; flag = P_ChangeSector(sector,crush); - if (flag == true) + + // villsa [STRIFE] unused + /*if (flag == true) { sector->floorheight = lastpos; P_ChangeSector(sector,crush); return crushed; - } + }*/ + return ok; } break; @@ -116,12 +123,15 @@ T_MovePlane flag = P_ChangeSector(sector,crush); if (flag == true) { - if (crush == true) - return crushed; + // villsa [STRIFE] unused + //if (crush == true) + //return crushed; sector->floorheight = lastpos; P_ChangeSector(sector,crush); return crushed; } + else + return ok; } break; } @@ -169,31 +179,29 @@ T_MovePlane // UP if (sector->ceilingheight + speed > dest) { - lastpos = sector->ceilingheight; + // villsa [STRIFE] unused + //lastpos = sector->ceilingheight; sector->ceilingheight = dest; - flag = P_ChangeSector(sector,crush); - if (flag == true) + + // villsa [STRIFE] unused + //flag = P_ChangeSector(sector,crush); + /*if (flag == true) { sector->ceilingheight = lastpos; P_ChangeSector(sector,crush); //return crushed; - } + }*/ return pastdest; } else { - lastpos = sector->ceilingheight; + // villsa [STRIFE] unused + //lastpos = sector->ceilingheight; sector->ceilingheight += speed; - flag = P_ChangeSector(sector,crush); -// UNUSED -#if 0 - if (flag == true) - { - sector->ceilingheight = lastpos; - P_ChangeSector(sector,crush); - return crushed; - } -#endif + + // villsa [STRIFE] unused + //flag = P_ChangeSector(sector,crush); + return ok; } break; } |