Add miscellaneous minor cleanups.

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

1 files changed, 5 insertions, 3 deletions

diff --git a/crawl-ref/source/newgame.cc b/crawl-ref/source/newgame.cc
index d747723d30..0bb41a2220 100644
--- a/crawl-ref/source/newgame.cc
+++ b/crawl-ref/source/newgame.cc
@@ -2028,9 +2028,11 @@ static bool _choose_book( item_def& book, int firstbook, int numbooks )
 
     if (Options.prev_book)
     {
-        const int opt_prev_book = _start_to_book(firstbook, Options.prev_book);
-        if (opt_prev_book == NUM_BOOKS && Options.prev_book != SBT_RANDOM)
+        if (_start_to_book(firstbook, Options.prev_book) == NUM_BOOKS
+            && Options.prev_book != SBT_RANDOM)
+        {
             Options.prev_book = SBT_NO_SELECTION;
+        }
     }
 
     if (!Options.random_pick && Options.book != SBT_RANDOM)
@@ -4246,7 +4248,7 @@ static bool _choose_wand()
         do
         {
             textcolor( CYAN );
-            cprintf(EOL "Which wand or rod? ");
+            cprintf(EOL "Which tool? ");
             textcolor( LIGHTGREY );
 
             keyin = c_getch();