TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Move test for opening doors back down

Browse source 
Locked doors, including the exit door, were permanently impassable in
Descent 1 because the door has state WALL_DOOR_OPENING even after it has
flags WALL_DOOR_OPENED.

Fixes: fd01d4c673 ("Reorder wall_is_doorway to favor likely results")
Reported by: zicodxx @ https://github.com/dxx-rebirth/dxx-rebirth/issues/40
This commit is contained in:
Kp 2015-02-15 17:24:55 +00:00
parent 5a015b38e5
commit 011689f038
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
similar/main/wall.cpp
View file

@ -106,9 +106,6 @@ WALL_IS_DOORWAY_result_t wall_is_doorway(const side &side)
if (type == WALL_OPEN)
return WID_NO_WALL;
if (likely(type == WALL_DOOR) && unlikely(w.state == WALL_DOOR_OPENING))
return WID_TRANSPARENT_WALL;
#if defined(DXX_BUILD_DESCENT_II)
if (unlikely(type == WALL_CLOAKED))
return WID_CLOAKED_WALL;
@ -134,10 +131,10 @@ WALL_IS_DOORWAY_result_t wall_is_doorway(const side &side)
else
return WID_WALL;
}
if (flags & WALL_DOOR_OPENED)
if (unlikely(flags & WALL_DOOR_OPENED))
return WID_TRANSILLUSORY_WALL;
if (likely(type == WALL_DOOR) && unlikely(w.state == WALL_DOOR_OPENING))
return WID_TRANSPARENT_WALL;
// If none of the above flags are set, there is no doorway.
if (check_transparency(side))
return WID_TRANSPARENT_WALL;