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

Unify D1/D2 openable_doors_in_segment conditions

Browse source
This commit is contained in:
Kp 2019-05-04 18:27:36 +00:00
parent 4d8d244bb9
commit b5ddcfdd7b
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
similar/main/ai.cpp
View file

@ -1870,12 +1870,19 @@ static unsigned openable_doors_in_segment(fvcwallptr &vcwallptr, const shared_se
if (wall_num != wall_none)
{
auto &w = *vcwallptr(wall_num);
#if defined(DXX_BUILD_DESCENT_I)
if (w.type == WALL_DOOR && w.keys == KEY_NONE && w.state == WALL_DOOR_CLOSED && !(w.flags & WALL_DOOR_LOCKED))
#elif defined(DXX_BUILD_DESCENT_II)
if (w.type == WALL_DOOR && w.keys == KEY_NONE && w.state == WALL_DOOR_CLOSED && !(w.flags & WALL_DOOR_LOCKED) && !(WallAnims[w.clip_num].flags & WCF_HIDDEN))
if (w.type != WALL_DOOR)
continue;
if (w.keys != KEY_NONE)
continue;
if (w.state != WALL_DOOR_CLOSED)
continue;
if (w.flags & WALL_DOOR_LOCKED)
continue;
#if defined(DXX_BUILD_DESCENT_II)
if (WallAnims[w.clip_num].flags & WCF_HIDDEN)
continue;
#endif
return i;
return i;
}
}
return side_none;