diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-13 20:31:07 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-13 20:31:07 +0000 |
| commit | 8e6e2f55250ec63fc49ce2c32eefd5f1a3453237 (patch) | |
| tree | ca9f6af7df506cf6aec1936afe2502e58cf47050 /crawl-ref/source | |
| parent | be37101456ffb168dd64291d132e2aa52547aed9 (diff) | |
| download | crawl-ref-8e6e2f55250ec63fc49ce2c32eefd5f1a3453237.tar.gz crawl-ref-8e6e2f55250ec63fc49ce2c32eefd5f1a3453237.zip | |
Apply trunk r6533 to 0.4.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6534 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source')
| -rw-r--r-- | crawl-ref/source/acr.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/command.cc | 4 | ||||
| -rw-r--r-- | crawl-ref/source/tutorial.cc | 7 | ||||
| -rw-r--r-- | crawl-ref/source/util/docs/quickstart.tex | 2 |
4 files changed, 8 insertions, 7 deletions
diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc index 2ac242a32d..043182e73a 100644 --- a/crawl-ref/source/acr.cc +++ b/crawl-ref/source/acr.cc @@ -3476,6 +3476,7 @@ static command_type _keycode_to_command( keycode_type key ) case 'D': return CMD_NO_CMD; case 'E': return CMD_EXPERIENCE_CHECK; case 'F': return CMD_THROW_ITEM_NO_QUIVER; + case CONTROL('G'): case 'G': return CMD_INTERLEVEL_TRAVEL; case 'I': return CMD_DISPLAY_SPELLS; case 'M': return CMD_MEMORISE_SPELL; @@ -3533,7 +3534,6 @@ static command_type _keycode_to_command( keycode_type key ) case CONTROL('C'): return CMD_CLEAR_MAP; case CONTROL('E'): return CMD_FORGET_STASH; case CONTROL('F'): return CMD_SEARCH_STASHES; - case CONTROL('G'): return CMD_INTERLEVEL_TRAVEL; case CONTROL('I'): return CMD_NO_CMD; // Tab on most systems case CONTROL('M'): return CMD_NO_CMD; // Enter on most systems case CONTROL('O'): return CMD_DISPLAY_OVERMAP; diff --git a/crawl-ref/source/command.cc b/crawl-ref/source/command.cc index 35333535c7..6ebf009edf 100644 --- a/crawl-ref/source/command.cc +++ b/crawl-ref/source/command.cc @@ -1885,8 +1885,8 @@ static void _add_formatted_keyhelp(column_composer &cols) "<h>Additional help:\n" "Many commands have context sensitive \n" "help, among them <w>X</w>, <w>x</w>, <w>f</w> (or any \n" - "form of targeting), <w>G</w> and <w>Ctrl-F</w>." - "\n", + "form of targeting), <w>Ctrl-G</w> or <w>G</w>, and \n" + "<w>Ctrl-F</w>.\n", true, true, _cmdhelp_textfilter); } diff --git a/crawl-ref/source/tutorial.cc b/crawl-ref/source/tutorial.cc index 2bf6ebc4aa..52404c0875 100644 --- a/crawl-ref/source/tutorial.cc +++ b/crawl-ref/source/tutorial.cc @@ -821,9 +821,10 @@ void tutorial_finished() else if (Options.tut_travel) { text = "There is a convenient way for travelling between far away " - "dungeon levels: press <w>Ctrl-G</w> and enter the desired " - "destination. If your travel gets interrupted, issuing " - "<w>Ctrl-G Enter</w> will continue it."; + "dungeon levels: press <w>Ctrl-G</w> or <w>G</w> and enter " + "the desired destination. If your travel gets interrupted, " + "issuing <w>Ctrl-G Enter</w> or <w>G Enter</w> will continue " + "it."; } else if (Options.tut_stashes) { diff --git a/crawl-ref/source/util/docs/quickstart.tex b/crawl-ref/source/util/docs/quickstart.tex index 5b6a72ecfd..77b13ecdf3 100644 --- a/crawl-ref/source/util/docs/quickstart.tex +++ b/crawl-ref/source/util/docs/quickstart.tex @@ -162,7 +162,7 @@ the beginning. \key{p} prays (press \key{\^} for god information) \\ \key{Ctrl-P} shows previous messages \\ \key{Ctrl-F} searches for items dungeon-wide \\ -\key{G} provides automated travel between levels \\ +\key{Ctrl-G} or \key{G} provides automated travel between levels \\ \key{o} provides automated exploration \\ \key{\#} dumps character to the file \texttt{name.txt} \\ \key{=} reassigns inventory or spell letters \\ |