diff options
Diffstat (limited to 'crawl-ref/source')
| -rw-r--r-- | crawl-ref/source/acr.cc | 4 | ||||
| -rw-r--r-- | crawl-ref/source/command.cc | 8 | ||||
| -rw-r--r-- | crawl-ref/source/util/docs/key_changes.tex | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc index 225681b04b..6e270d640a 100644 --- a/crawl-ref/source/acr.cc +++ b/crawl-ref/source/acr.cc @@ -3476,7 +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 'G': return CMD_INTERLEVEL_TRAVEL; + case 'G': return CMD_FULL_VIEW; case 'I': return CMD_DISPLAY_SPELLS; case 'M': return CMD_MEMORISE_SPELL; case 'O': return CMD_OPEN_DOOR; @@ -3533,7 +3533,7 @@ 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_FULL_VIEW; + 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 f86f95082c..2b46088a8d 100644 --- a/crawl-ref/source/command.cc +++ b/crawl-ref/source/command.cc @@ -362,7 +362,7 @@ static void _adjust_spells(void) mpr("Adjust which spell?", MSGCH_PROMPT); int keyin = 0; - if ( Options.auto_list ) + if (Options.auto_list) keyin = list_spells(); else { @@ -371,7 +371,7 @@ static void _adjust_spells(void) keyin = list_spells(); } - if ( !isalpha(keyin) ) + if (!isalpha(keyin)) { canned_msg( MSG_OK ); return; @@ -1744,7 +1744,7 @@ static void _add_formatted_keyhelp(column_composer &cols) 0, "<h>Extended Movement:\n" "<w>o</w> : auto-explore\n" - "<w>G</w> : interlevel travel\n" + "<w>Ctrl-G</w> : interlevel travel\n" "<w>Ctrl-F</w> : Find items\n" "<w>Ctrl-W</w> : set Waypoint\n" "<w>Ctrl-E</w> : Exclude square from searches\n" @@ -1830,7 +1830,7 @@ static void _add_formatted_keyhelp(column_composer &cols) "<w>)</w> : display current weapons\n" "<w>\"</w> : display worn jewellery\n" "<w>E</w> : display experience info\n" - "<w>Ctrl-G</w> : list monsters in sight\n", + "<w>G</w> : list monsters in sight\n", true, true, _cmdhelp_textfilter); cols.add_formatted( diff --git a/crawl-ref/source/util/docs/key_changes.tex b/crawl-ref/source/util/docs/key_changes.tex index 1d791d724d..42dd93ea90 100644 --- a/crawl-ref/source/util/docs/key_changes.tex +++ b/crawl-ref/source/util/docs/key_changes.tex @@ -73,12 +73,12 @@ key & new command \\ \hline \key{Q} & \mc{quiver item} \\ \key{`} & \mc{redo previous command} \\ \key{0} & \mc{repeat next command} \\ +\key{G} & \mc{verbose list of monsters in sight} \\ \key{Ctrl-T} & \mc{toggle ally pickup mode (only for permanent allies)} \\ \key{Ctrl-D} & \mc{add macro (a new synonym for \key{$\sim$})} \\ \\ \\ new key & command & old key \\ \hline -\key{G} & auto-travel & was \key{Ctrl-G} \\ \key{z} & cast spell & was \key{Z} \\ \key{Z} & zap wand & was \key{z} \\ \key{o} & auto-explore & was \key{Ctrl-O} \\ @@ -114,7 +114,7 @@ item to be thrown, but this command does not affect the quiver. The colours of many monsters have been changed. Most notably, there are no darkgrey monsters anymore. In case darkgrey is actually better visible than blue on your system, you can swap these colours using the line \\ -\verb# colour: darkblue = darkgrey #\\ +\verb# colour.blue = darkgrey #\\ in \key{init.txt}. Apart from that, more dangerous monsters are now generally displayed in lighter colours. |