From a197f7ae045a5b682bd4c2039d16c6425c35ecd5 Mon Sep 17 00:00:00 2001 From: j-p-e-g Date: Sun, 30 Mar 2008 00:48:43 +0000 Subject: Another, no, scratch that: THE tutorial improvement for tiles. Using horrific amounts of #ifdef USE_TILE etc, the tutorial texts now give different information for tiles (mouse clicks) and non-tiles (key commands). Unfortunately, while I am confident this is a vast improvement the new messages for tiles tend to be rather wordy because "clicking on the item with your left mouse button" is much verbose than "pressing 'w'". That, and most of the time I want to print the tile information *in addition* to the general commands. So, it would be helpful if someone else could go over the texts at one point - there's no need to hurry, though. Also a bit of general improvement, which is always nice. I'd somehow forgotten to include a tutorial trigger for mutations, and of course the first potion I tried was mutation. :) git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3941 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/describe.cc | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'crawl-ref/source/describe.cc') diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc index 7fa4f9b43e..7248cc12ec 100644 --- a/crawl-ref/source/describe.cc +++ b/crawl-ref/source/describe.cc @@ -1763,9 +1763,8 @@ void describe_item( item_def &item, bool allow_inscribe ) break; } - // Don't ask during tutorial, or if there aren't enough rows left - if (!Options.tutorial_left && allow_inscribe - && wherey() <= get_number_of_lines() - 3) + // Don't ask if there aren't enough rows left + if (allow_inscribe && wherey() <= get_number_of_lines() - 3) { cgotoxy(1, wherey() + 2); @@ -1793,9 +1792,13 @@ void describe_item( item_def &item, bool allow_inscribe ) "Do you wish to inscribe this item? ").display(); } +#ifdef USE_TILE + const int keyin = getch_ck(); + if (toupper(keyin) == 'Y' || keyin == CK_MOUSE_B1) +#else const int keyin = getch(); - if (toupper(keyin) == 'Y') +#endif { char buf[79]; cprintf("\nInscribe with what? "); -- cgit v1.2.3-54-g00ecf