diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-03-08 21:23:15 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-03-08 21:23:15 +0000 |
| commit | 89cc8c5fc577431da1bf48c79be1726d3ec095ba (patch) | |
| tree | d7f42f14bb9ae940045551484295f103afc1d60d /crawl-ref/source/menu.cc | |
| parent | 6760ab3170033b2ecceb6ced51e2de7a5d78d6fe (diff) | |
| download | crawl-ref-89cc8c5fc577431da1bf48c79be1726d3ec095ba.tar.gz crawl-ref-89cc8c5fc577431da1bf48c79be1726d3ec095ba.zip | |
Tiles:
* (Re?)allow mouseclicks in menus (Tiles, only):
L-click = scroll down, R-click = Esc
* Clear last_clicked_grid if you move your mouse.
* When entering a new level, draw the map before handling monster shouts.
Enne, please review the changes. Thanks!
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9386 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/menu.cc')
| -rw-r--r-- | crawl-ref/source/menu.cc | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/crawl-ref/source/menu.cc b/crawl-ref/source/menu.cc index 982df74791..6c5c41c67b 100644 --- a/crawl-ref/source/menu.cc +++ b/crawl-ref/source/menu.cc @@ -298,7 +298,13 @@ void Menu::do_menu() alive = true; while (alive) { - int keyin = getchm(KC_MENU, c_getch); + mouse_control mc(MOUSE_MODE_MORE); + int keyin = +#ifndef USE_TILE + getchm(KC_MENU, c_getch); +#else + getch(); +#endif if (!process_key( keyin )) return; @@ -343,11 +349,13 @@ bool Menu::process_key( int keyin ) return (false); case CK_ESCAPE: case CK_MOUSE_B2: + case CK_MOUSE_CMD: sel.clear(); lastch = keyin; return (false); case ' ': case CK_PGDN: case '>': case '\'': case CK_MOUSE_B1: + case CK_MOUSE_CLICK: nav = true; repaint = page_down(); if (!repaint && !is_set(MF_EASY_EXIT) && !is_set(MF_NOWRAP)) @@ -1694,9 +1702,11 @@ bool formatted_scroller::process_key( int keyin ) return (true); case -1: case CK_ESCAPE: + case CK_MOUSE_CMD: return (false); case ' ': case '+': case '=': case CK_PGDN: case '>': case '\'': case CK_MOUSE_B5: + case CK_MOUSE_CLICK: repaint = page_down(); break; case '-': case CK_PGUP: case '<': case ';': |