diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-03-09 18:49:14 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-03-09 18:49:14 +0000 |
| commit | 31ecf11f2b7ff57426fb26fce5e3e63444e743c3 (patch) | |
| tree | b1b833eea1ac7f74044df506716ef65468127945 /crawl-ref/source/menu.cc | |
| parent | 8387025f9dbca1c317d332b8e17661d55d5928bb (diff) | |
| download | crawl-ref-31ecf11f2b7ff57426fb26fce5e3e63444e743c3.tar.gz crawl-ref-31ecf11f2b7ff57426fb26fce5e3e63444e743c3.zip | |
* Add tile for Nergalle, who's actually not all that ugly but apparently
has a really bad fashion sense.
* Add a sticky flame marker for monsters.
* Replace the trapdoor spider tile with a less original, but nicer one.
* Improve shopping interface: replace "examine item" command with a
toggle between browsing and shopping.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9397 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/menu.cc')
| -rw-r--r-- | crawl-ref/source/menu.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/crawl-ref/source/menu.cc b/crawl-ref/source/menu.cc index 6c5c41c67b..7d3cfcacb4 100644 --- a/crawl-ref/source/menu.cc +++ b/crawl-ref/source/menu.cc @@ -298,12 +298,11 @@ void Menu::do_menu() alive = true; while (alive) { - mouse_control mc(MOUSE_MODE_MORE); - int keyin = #ifndef USE_TILE - getchm(KC_MENU, c_getch); + int keyin = getchm(KC_MENU, c_getch); #else - getch(); + mouse_control mc(MOUSE_MODE_MORE); + int keyin = getch(); #endif if (!process_key( keyin )) @@ -1071,7 +1070,7 @@ int slider_menu::item_colour(int index, const MenuEntry *me) const #if defined(WIN32CONSOLE) || defined(DOS) colour = dos_brand(colour, CHATTR_REVERSE); #elif defined(USE_TILE) - colour = colour == WHITE ? YELLOW : WHITE; + colour = (colour == WHITE ? YELLOW : WHITE); #else colour |= COLFLAG_REVERSE; #endif |