diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-16 13:51:20 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-16 13:51:20 +0000 |
| commit | e2e74507bbc5ce16bad61bedc0bd881acdbea280 (patch) | |
| tree | 1633043f410a5927d0d0f3086e3afaec3594cd2a /crawl-ref/source/tutorial.cc | |
| parent | 45d98c4f38de1e47e159d17a8a6be6217c673dc3 (diff) | |
| download | crawl-ref-e2e74507bbc5ce16bad61bedc0bd881acdbea280.tar.gz crawl-ref-e2e74507bbc5ce16bad61bedc0bd881acdbea280.zip | |
Implemented a modified version of FR 1994116: change inscription
interface.
Instead of "Do you wish to inscribe this item? (y/n)" directly print
"Add what to inscription? (You may also (a)utoinscribe or (c)lear it.)"
(a) and (c) only where applicable, of course.
This has two benefits: No extra prompt needed to inscribe anything,
and I've finally managed to merge both the { prompt and inscribing
from viewing into the same function.
Escape or pressing Enter on an empty inscription string (or one only
consisting of spaces) will return without changing anything.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5879 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/tutorial.cc')
| -rw-r--r-- | crawl-ref/source/tutorial.cc | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/crawl-ref/source/tutorial.cc b/crawl-ref/source/tutorial.cc index 76f32ea905..496ce598a1 100644 --- a/crawl-ref/source/tutorial.cc +++ b/crawl-ref/source/tutorial.cc @@ -3475,7 +3475,7 @@ void tutorial_describe_item(const item_def &item) formatted_string::parse_block(broken, false).display(); } // tutorial_describe_item() -void tutorial_inscription_info(bool autoinscribe) +void tutorial_inscription_info(bool autoinscribe, std::string prompt) { // Don't print anything if there's not enough space. if (wherey() >= get_number_of_lines() - 1) @@ -3500,8 +3500,7 @@ void tutorial_inscription_info(bool autoinscribe) { text << EOL "Artefacts can be autoinscribed to give a brief overview of their " EOL - "known properties. Here, doing a <w>left mouse click</w> will autoinscribe " EOL - "this item."; + "known properties."; longtext = true; } @@ -3511,20 +3510,9 @@ void tutorial_inscription_info(bool autoinscribe) formatted_string::parse_string(text.str()).display(); - if (longtext && wherey() <= get_number_of_lines() - 2) - { - if (autoinscribe) - { - formatted_string::parse_string( - "<cyan>So, do you wish to inscribe this item? " - "('a' to autoinscribe) ").display(); - } - else - { - formatted_string::parse_string( - "<cyan>So, do you wish to inscribe this item? ").display(); - } - } + // Ask a second time, if it's been a longish interruption. + if (longtext && !prompt.empty() && wherey() <= get_number_of_lines() - 2) + formatted_string::parse_string(prompt).display(); } bool tutorial_pos_interesting(int x, int y) |