diff options
| author | ennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-24 01:05:13 +0000 |
|---|---|---|
| committer | ennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-24 01:05:13 +0000 |
| commit | 04fbe88386b9ebe9d655b0270c9453a885b05d1c (patch) | |
| tree | 1f930862a4ba46521b9de99f119b82bc94128235 /crawl-ref/source/tilereg.cc | |
| parent | ad41d5af4c2b0379871d3ab295d57c51ae89d843 (diff) | |
| download | crawl-ref-04fbe88386b9ebe9d655b0270c9453a885b05d1c.tar.gz crawl-ref-04fbe88386b9ebe9d655b0270c9453a885b05d1c.zip | |
Fixing Tiles mouse performance issue found by Johanna. Fixing various Tiles crashes (oops).
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6656 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/tilereg.cc')
| -rw-r--r-- | crawl-ref/source/tilereg.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/crawl-ref/source/tilereg.cc b/crawl-ref/source/tilereg.cc index 4d9ff8645e..0fff45c4d7 100644 --- a/crawl-ref/source/tilereg.cc +++ b/crawl-ref/source/tilereg.cc @@ -1164,14 +1164,13 @@ bool DungeonRegion::update_tip_text(std::string& tip) if (!grid_is_solid(m_cursor[CURSOR_MOUSE])) { int mon_num = mgrd(m_cursor[CURSOR_MOUSE]); - const monsters *mons = &menv[mon_num]; - if (mon_num == NON_MONSTER || mons_friendly(mons)) + if (mon_num == NON_MONSTER || mons_friendly(&menv[mon_num])) { tip = "[L-Click] Move\n"; } else if (mon_num != NON_MONSTER) { - tip = mons->name(DESC_CAP_A); + tip = menv[mon_num].name(DESC_CAP_A); tip += "\n[L-Click] Attack\n"; } } @@ -1454,7 +1453,7 @@ unsigned int InventoryRegion::cursor_index() const void InventoryRegion::place_cursor(const coord_def &cursor) { - if (m_cursor != NO_CURSOR) + if (m_cursor != NO_CURSOR && cursor_index() < m_items.size()) { m_items[cursor_index()].flag &= ~TILEI_FLAG_CURSOR; m_need_to_pack = true; |