diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2011-03-13 01:48:10 +0100 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2011-03-13 01:48:10 +0100 |
| commit | 51b381ba462cf6a355f401e817ee2b63518c077b (patch) | |
| tree | a431ca5243bf2452d6ed47f153fb4d2663def8d8 /crawl-ref/source/macro.cc | |
| parent | e7c3fa432cecc5eeb49d79109033fd85ee3cad2a (diff) | |
| parent | ce4dbcfd8506d4b4ce6047e1f3c1e7a06f84e09c (diff) | |
| download | crawl-ref-51b381ba462cf6a355f401e817ee2b63518c077b.tar.gz crawl-ref-51b381ba462cf6a355f401e817ee2b63518c077b.zip | |
Merge branch 'master' into unicode
Diffstat (limited to 'crawl-ref/source/macro.cc')
| -rw-r--r-- | crawl-ref/source/macro.cc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/crawl-ref/source/macro.cc b/crawl-ref/source/macro.cc index 602804f93d..64137086ff 100644 --- a/crawl-ref/source/macro.cc +++ b/crawl-ref/source/macro.cc @@ -1381,7 +1381,7 @@ static std::string _special_keys_to_string(int key) return (cmd); } -std::string command_to_string(command_type cmd) +std::string command_to_string(command_type cmd, bool tutorial) { const int key = command_to_key(cmd); @@ -1390,7 +1390,12 @@ std::string command_to_string(command_type cmd) return (desc); if (key >= 32 && key < 256) - snprintf(info, INFO_SIZE, "%c", (char) key); + { + if (tutorial && key >= 'A' && key <= 'Z') + snprintf(info, INFO_SIZE, "uppercase %c", (char) key); + else + snprintf(info, INFO_SIZE, "%c", (char) key); + } else if (key > 1000 && key <= 1009) { const int numpad = (key - 1000); |