Put tables.txt into the help (hotkeyed to 's', for 'skills'.)

Made help accessible from the race/class choosing screens by '+'.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@755 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 29 insertions, 6 deletions

diff --git a/crawl-ref/source/newgame.cc b/crawl-ref/source/newgame.cc
index cf5e711264..3b50039221 100644
--- a/crawl-ref/source/newgame.cc
+++ b/crawl-ref/source/newgame.cc
@@ -71,6 +71,7 @@
 
 #include "abl-show.h"
 #include "branch.h"
+#include "command.h"
 #include "dungeon.h"
 #include "files.h"
 #include "fight.h"
@@ -2950,11 +2951,16 @@ spec_query:
         textcolor( BROWN );
         
         if (you.char_class == JOB_UNKNOWN)
-            cprintf(EOL "SPACE - Choose class first; "
-                        "? - Random Species; * - Random Character; X - Quit" 
+            cprintf(EOL
+                    "SPACE - Choose class first; ? - Random Species; "
+                    "* - Random Character"
+                    EOL
+                    "+ - Help; X - Quit"
                     EOL);
         else
-            cprintf(EOL "? - Random; Bksp - Back to class selection; X - Quit" 
+            cprintf(EOL
+                    "+ - Help ? - Random; "
+                    "Bksp - Back to class selection; X - Quit" 
                     EOL);
 
         if (Options.prev_race)
@@ -2984,6 +2990,12 @@ spec_query:
         keyn = c_getch();
     }
 
+    if ( keyn == '+' )
+    {
+        list_commands(false);
+        return choose_race();
+    }
+
     if ((keyn == '\r' || keyn == '\n') && Options.prev_race && prevraceok)
         keyn = Options.prev_race;
 
@@ -3144,11 +3156,16 @@ job_query:
 
         textcolor( BROWN );
         if (!you.species)
-            cprintf(EOL "SPACE - Choose species first; "
-                        "? - Random Class; * - Random Character; X - Quit" 
+            cprintf(EOL
+                    "SPACE - Choose species first; ? - Random Class; "
+                    "* - Random Character"
+                    EOL
+                    "+ - Help; X - Quit" 
                     EOL);
         else
-            cprintf(EOL "? - Random; Bksp - Back to species selection; X - Quit" 
+            cprintf(EOL
+                    "+ - Help; ? - Random; "
+                    "Bksp - Back to species selection; X - Quit" 
                     EOL);
 
         if (Options.prev_cls)
@@ -3178,6 +3195,12 @@ job_query:
         keyn = c_getch();
     }
 
+    if ( keyn == '+' )
+    {
+        list_commands(false);
+        return choose_class();
+    }
+
     if ((keyn == '\r' || keyn == '\n') && Options.prev_cls && prevclassok)
         keyn = Options.prev_cls;