diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-11-19 14:08:58 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-11-19 14:08:58 +0000 |
| commit | 9cce2935d8da7147bebe3d4aeb4a4283b779f798 (patch) | |
| tree | f3064a5c4daf169919d8e4b0335abfbd76bd05a0 /crawl-ref/source/describe.cc | |
| parent | 6a93b55183ada2559d026ae0dd57a295ae1807f4 (diff) | |
| download | crawl-ref-9cce2935d8da7147bebe3d4aeb4a4283b779f798.tar.gz crawl-ref-9cce2935d8da7147bebe3d4aeb4a4283b779f798.zip | |
A number of tutorial improvements, including reintroducing info on spellbooks.
Also:
Fix 1832819. (Horn mutation not making helmet slot show as "restricted")
Fix 1831983. (Autobutcher now ignores weapons inscribed with !w)
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2872 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/describe.cc')
| -rw-r--r-- | crawl-ref/source/describe.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc index 3d86f433b9..365336611c 100644 --- a/crawl-ref/source/describe.cc +++ b/crawl-ref/source/describe.cc @@ -3417,6 +3417,8 @@ static void show_item_description(const item_def &item) const std::string description = get_item_description( item, 1 ); print_description(description); + if (Options.tutorial_left) + tutorial_describe_item(item); if (item.has_spells()) { @@ -3475,13 +3477,9 @@ void describe_item( item_def &item, bool allow_inscribe ) break; } - if (Options.tutorial_left) - { - tutorial_describe_item(item); - getch(); - } // Don't ask during tutorial, or if there aren't enough rows left - else if (allow_inscribe && wherey() <= get_number_of_lines() - 3) + if (!Options.tutorial_left && allow_inscribe + && wherey() <= get_number_of_lines() - 3) { gotoxy(1, wherey() + 2); formatted_string::parse_string( |