Simplify again.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5957 c06c8d41-db1a-0410-9941-cceddc491573

2 files changed, 5 insertions, 5 deletions

diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc
index ae7ac4af5c..cae6179118 100644
--- a/crawl-ref/source/mon-util.cc
+++ b/crawl-ref/source/mon-util.cc
@@ -6236,9 +6236,9 @@ bool monsters::do_shaft()
         return (false);
 
     set_transit(lev);
-    bool reveal = false;
-    if (simple_monster_message(this, " falls through a shaft!"))
-        reveal = true;;
+
+    const bool reveal =
+        simple_monster_message(this, " falls through a shaft!");
 
     handle_items_on_shaft(this->x, this->y, false);
 
diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc
index 28ae299f8c..1d50be0fec 100644
--- a/crawl-ref/source/monstuff.cc
+++ b/crawl-ref/source/monstuff.cc
@@ -2385,9 +2385,9 @@ static void _mons_find_level_exits(const monsters *mon,
             e.push_back(*ri);
 
         // Teleportation or shaft traps.
-        trap_type tt = trap_type_at_xy((*ri).x, (*ri).y);
+        trap_type tt = trap_type_at_xy(ri->x, ri->y);
         if ((tt == TRAP_TELEPORT || tt == TRAP_SHAFT)
-            && _is_trap_safe(mon, (*ri).x, (*ri).y))
+            && _is_trap_safe(mon, ri->x, ri->y))
         {
             e.push_back(*ri);
         }