Apply my previous commit to 0.4.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6503 c06c8d41-db1a-0410-9941-cceddc491573

5 files changed, 24 insertions, 25 deletions

diff --git a/crawl-ref/docs/034_changes.txt b/crawl-ref/docs/034_changes.txt
index e176cfcc79..5e1616ef74 100644
--- a/crawl-ref/docs/034_changes.txt
+++ b/crawl-ref/docs/034_changes.txt
@@ -5,7 +5,6 @@ There have been many changes to the interface in the new version. Among
 them:
 
 * Swapped some command keys around:
-   G         auto-travel      (was Ctrl-G)
    z         cast spell       (was Z)
    Z         zap wand         (was z)
    o         auto-explore     (was Ctrl-O)
@@ -22,19 +21,18 @@ them:
 
 * Added some new commands:
    !         annotate dungeon level
-             (If your annotation contains '!' you'll be prompted whenever 
+             (If your annotation contains '!' you'll be prompted whenever
              you attempt to enter the level.)
    (         cycle the quiver to the next appropriate item
    Q         quiver an item for firing
    `         repeat previous command
    0         repeat next command # of times
+   G         verbose list of monsters in sight
    Ctrl-D    define macros (synonym to '~')
-   Ctrl-G    verbose list of monsters in sight
    Ctrl-T    change your allies' pickup behaviour
              (only available to some characters)
 
-
-   There is a file called "key_changes.pdf" in the /docs directory that
+   There is a file called "key_changes.pdf" in the docs/ directory that
    lists all of these command changes on a printable reference sheet.
 
 * Removed the 'v' command (view item in inventory). Its functionality is
@@ -61,7 +59,7 @@ them:
 * 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
-     colour: darkblue = darkgrey
+     colour.blue = darkgrey
   in init.txt.
   Apart from that, more dangerous monsters are now generally displayed in
   lighter colours.
@@ -73,17 +71,17 @@ the 0.3.4 state by using the following options:
    additional_macro_file   = 034_command_keys.txt
    always_confirm_butcher  = true
 
-Note that the header of init.txt contains these lines. (It contains some 
-more options for using other old settings.) The options are commented out, 
-so you just need to remove the # in front in order to activate them. You 
-can choose to use only part of these options. In case you decide to use 
-the old keyset, be aware that D is also a synonym for 'yes' in the 
+Note that the header of init.txt contains these lines. (It contains some
+more options for using other old settings.) The options are commented out,
+so you just need to remove the # in front in order to activate them. You
+can choose to use only part of these options. In case you decide to use
+the old keyset, be aware that D is also a synonym for 'yes' in the
 butcher interface.
 
 If you choose to go with the new keyset or the new butcher interface and
-you intend to use your old macros, you'll need to look through your 
+you intend to use your old macros, you'll need to look through your
 macro.txt file.
 
 There are a number of new options, some of them outsourced into various
-files in the /settings folder, so if you intend to use your old init file,
+files in the settings/ folder, so if you intend to use your old init file,
 you may still want to at least look through the new one.
diff --git a/crawl-ref/docs/crawl_manual.txt b/crawl-ref/docs/crawl_manual.txt
index 7013763ed4..2367ae9cab 100644
--- a/crawl-ref/docs/crawl_manual.txt
+++ b/crawl-ref/docs/crawl_manual.txt
@@ -2244,16 +2244,16 @@ Movement:
     Shift-direction     This moves straight until something interesting
     or  / direction     is found (like a monster). If the first square
                         is a trap, movement starts nonetheless.
-    G                   Interlevel travel (to arbitrary dungeon levels
-                        or waypoints). Remembers old destinations if
-                        interrupted. This command has its own set of
-                        shortcuts; use ? for help on them.
     o                   Auto-explore. Setting the option explore_greedy
                         to true makes auto-explore run to interesting
                         items (those that get picked up automatically)
                         or piles (checking the contents).
                         Autoexploration will open doors on its own
                         except if you set easy_open to false.
+    Ctrl-G              Interlevel travel (to arbitrary dungeon levels
+                        or waypoints). Remembers old destinations if
+                        interrupted. This command has its own set of
+                        shortcuts; use ? for help on them.
     Ctrl-W              Set waypoint (a digit between 0 and 9). Check
                         the option show_waypoints. You can go to a
                         waypoint by pressing Ctrl-G and the digit.
@@ -2378,6 +2378,7 @@ Other game-playing commands:
     p                   Pray (or renew an existing prayer).
     z                   Cast a spell. 
     I                   List spells. 
+    G                   Prints a short list of monsters in sight.
     t                   Tell commands to allies, or shout (the latter
                         with tt).
     Ctrl-A              Toggle autopickup. Note that encounters with 
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.