diff options
| author | Neil Moore <neil@s-z.org> | 2012-09-10 04:24:05 -0400 |
|---|---|---|
| committer | Neil Moore <neil@s-z.org> | 2012-09-10 04:27:12 -0400 |
| commit | eb43362add1cff79cca1a3b9b802ac990870b8ec (patch) | |
| tree | 46660ed90d475572a1370afd4c152b5687502ded /crawl-ref/source/viewmap.cc | |
| parent | a60899f5cf216cf95e1a1108f7824f138cf3e77d (diff) | |
| download | crawl-ref-eb43362add1cff79cca1a3b9b802ac990870b8ec.tar.gz crawl-ref-eb43362add1cff79cca1a3b9b802ac990870b8ec.zip | |
Tiles: Always display the navigation tab when map-viewing.
Handle it in show_map() rather than in _do_display_map() so that
entering the map from (for example) Ctrl-F still switches tabs.
Likewise the mouse control.
I debated moving the map help message ("Move the cursor to view the
level map . . .") into show_map() as well, but I'm not so sure about
that.
Fixes #6204.
Diffstat (limited to 'crawl-ref/source/viewmap.cc')
| -rw-r--r-- | crawl-ref/source/viewmap.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/crawl-ref/source/viewmap.cc b/crawl-ref/source/viewmap.cc index ade1253022..933576864f 100644 --- a/crawl-ref/source/viewmap.cc +++ b/crawl-ref/source/viewmap.cc @@ -700,6 +700,9 @@ bool show_map(level_pos &lpos, bool chose = false; #ifdef USE_TILE_LOCAL bool first_run = true; + + mouse_control mc(MOUSE_MODE_NORMAL); + tiles.do_map_display(); #endif { levelview_excursion le(travel_mode); @@ -1308,6 +1311,10 @@ bool show_map(level_pos &lpos, #endif redraw_screen(); +#ifdef USE_TILE_LOCAL + tiles.set_map_display(false); +#endif + return chose; } |