From 67fd9a8cc159a1853da013ba188692a450de7a87 Mon Sep 17 00:00:00 2001 From: j-p-e-g Date: Sun, 5 Jul 2009 21:11:56 +0000 Subject: Use MOUSE_MODE_MORE during the ring swap prompt, so mouse clicks are ignored instead of taking zero turn actions or crashing the game. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10102 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/settings/init.txt | 2 +- crawl-ref/source/item_use.cc | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/crawl-ref/settings/init.txt b/crawl-ref/settings/init.txt index 5622302925..034816f925 100644 --- a/crawl-ref/settings/init.txt +++ b/crawl-ref/settings/init.txt @@ -231,7 +231,7 @@ stash_filter = ring of hunger, amulet of inaccuracy # easy_exit_menu = false # msg_condense_repeats = false # sort_menus = pickup: true : art, ego, basename, qualname, curse, qty -sort_menus = inv: true : equipped, freshness +sort_menus = inv: true : equipped, freshness, charged ##### 4-j Messages and Display Enhancements ##### diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index 49c6496b15..9266f445cd 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -3278,6 +3278,10 @@ static int _prompt_ring_to_remove(int new_ring) mprf(" < or %s", left->name(DESC_INVENTORY).c_str()); mprf(" > or %s", right->name(DESC_INVENTORY).c_str()); + // Deactivate choice from tile inventory. + // FIXME: We need to be able to get the choice (item letter) + // *without* the choice taking action by itself! + mouse_control mc(MOUSE_MODE_MORE); int c; do c = getch(); -- cgit v1.2.3-54-g00ecf