From 6420b73c2e89f91d5a40b4900e909e50066d2949 Mon Sep 17 00:00:00 2001
From: David Lawrence Ramsey <dolorous@users.sourceforge.net>
Date: Fri, 30 Oct 2009 20:27:40 -0500
Subject: Simplify.

---
 crawl-ref/source/xom.cc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'crawl-ref/source/xom.cc')

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);
         }
-- 
cgit v1.2.3-54-g00ecf