summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/acr.cc
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-03-30 00:48:43 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-03-30 00:48:43 +0000
commita197f7ae045a5b682bd4c2039d16c6425c35ecd5 (patch)
tree83635b17b54c05330f4f6feb3b0fe0063d0479e1 /crawl-ref/source/acr.cc
parent91179c38e250640d7eb30ad27a800458d36a2389 (diff)
downloadcrawl-ref-a197f7ae045a5b682bd4c2039d16c6425c35ecd5.tar.gz
crawl-ref-a197f7ae045a5b682bd4c2039d16c6425c35ecd5.zip
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
Diffstat (limited to 'crawl-ref/source/acr.cc')
-rw-r--r--crawl-ref/source/acr.cc13
1 files changed, 9 insertions, 4 deletions
diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc
index 8fa1480ddd..5a03424307 100644
--- a/crawl-ref/source/acr.cc
+++ b/crawl-ref/source/acr.cc
@@ -399,6 +399,10 @@ static void _startup_tutorial()
// print stats and everything
_prep_input();
+#ifdef USE_TILE
+ tile_draw_inv(REGION_INV1);
+#endif
+
msg::streams(MSGCH_TUTORIAL)
<< "Press any key to start the tutorial intro, or Escape to skip it."
<< std::endl;
@@ -1849,10 +1853,10 @@ void process_command( command_type cmd )
InvAction act;
gui_get_mouse_inv(idx, act);
- if (idx < 0)
+ if (idx < 0) // item on floor
describe_item(mitm[-idx]);
- else
- describe_item(you.inv[idx]);
+ else // item in inventory
+ describe_item(you.inv[idx], true);
redraw_screen();
}
break;
@@ -2446,7 +2450,8 @@ void process_command( command_type cmd )
default:
if (Options.tutorial_left)
{
- std::string msg = "Unknown command. (For a list of commands type <w>?<lightgray>.)";
+ std::string msg = "Unknown command. (For a list of commands type "
+ "<w>?\?<lightgray>.)";
print_formatted_paragraph(msg, get_number_of_cols());
}
else // well, not examine, but...