diff options
| author | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-10-30 20:27:40 -0500 |
|---|---|---|
| committer | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-10-30 20:27:40 -0500 |
| commit | 6420b73c2e89f91d5a40b4900e909e50066d2949 (patch) | |
| tree | d4b2a47a39a93d38a5e3c2ab82530ae3d040ebc0 /crawl-ref/source/xom.cc | |
| parent | 48edd0b868b31567d5bd1caa3531a610916d3a89 (diff) | |
| download | crawl-ref-6420b73c2e89f91d5a40b4900e909e50066d2949.tar.gz crawl-ref-6420b73c2e89f91d5a40b4900e909e50066d2949.zip | |
Simplify.
Diffstat (limited to 'crawl-ref/source/xom.cc')
| -rw-r--r-- | crawl-ref/source/xom.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/crawl-ref/source/xom.cc b/crawl-ref/source/xom.cc index 1ee189cc21..93861e6a3f 100644 --- a/crawl-ref/source/xom.cc +++ b/crawl-ref/source/xom.cc @@ -42,6 +42,7 @@ #include "stash.h" #include "state.h" #include "stuff.h" +#include "terrain.h" #include "transfor.h" #include "traps.h" #include "view.h" @@ -1992,8 +1993,8 @@ static int _xom_change_scenery(bool debug = false) if (feat >= DNGN_FOUNTAIN_BLUE && feat <= DNGN_DRY_FOUNTAIN_BLOOD) candidates.push_back(*ri); else if (feat >= DNGN_CLOSED_DOOR && feat <= DNGN_SECRET_DOOR - || feat == DNGN_OPEN_DOOR && you.pos() != *ri - && !monster_at(*ri) && igrd(*ri) == NON_ITEM) + || feat == DNGN_OPEN_DOOR && !actor_at(*ri) + && igrd(*ri) == NON_ITEM) { candidates.push_back(*ri); } |