summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/tilereg.cc
diff options
context:
space:
mode:
Diffstat (limited to 'crawl-ref/source/tilereg.cc')
-rw-r--r--crawl-ref/source/tilereg.cc10
1 files changed, 4 insertions, 6 deletions
diff --git a/crawl-ref/source/tilereg.cc b/crawl-ref/source/tilereg.cc
index cff4edb5ae..f54d178452 100644
--- a/crawl-ref/source/tilereg.cc
+++ b/crawl-ref/source/tilereg.cc
@@ -1382,14 +1382,12 @@ bool DungeonRegion::update_tip_text(std::string& tip)
if (!cell_is_solid(m_cursor[CURSOR_MOUSE]))
{
- int mon_num = mgrd(m_cursor[CURSOR_MOUSE]);
- if (mon_num == NON_MONSTER || mons_friendly(&menv[mon_num]))
- {
+ const monsters *mon = monster_at(m_cursor[CURSOR_MOUSE]));
+ if (!mon || mons_friendly(mon))
tip = "[L-Click] Move\n";
- }
- else if (mon_num != NON_MONSTER)
+ else if (mon)
{
- tip = menv[mon_num].name(DESC_CAP_A);
+ tip = mon->name(DESC_CAP_A);
tip += "\n[L-Click] Attack\n";
}
}