Add minor cosmetic fixes.

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

10 files changed, 53 insertions, 53 deletions

diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc
index 8beab070af..faf758e55a 100644
--- a/crawl-ref/source/acr.cc
+++ b/crawl-ref/source/acr.cc
@@ -3002,8 +3002,8 @@ static void _open_door(coord_def move, bool check_confused)
     }
     else
     {
-        mpr("Which direction?", MSGCH_PROMPT);
-        direction( door_move, DIR_DIR );
+        mpr("Which direction? ", MSGCH_PROMPT);
+        direction(door_move, DIR_DIR);
 
         if (!door_move.isValid)
             return;
@@ -3154,8 +3154,9 @@ static void _close_door(coord_def move)
 
     if (move.origin())
     {
-        mpr("Which direction?", MSGCH_PROMPT);
-        direction( door_move, DIR_DIR );
+        mpr("Which direction? ", MSGCH_PROMPT);
+        direction(door_move, DIR_DIR);
+
         if (!door_move.isValid)
             return;
     }
diff --git a/crawl-ref/source/command.cc b/crawl-ref/source/command.cc
index 65c96e57ae..5c14f28e38 100644
--- a/crawl-ref/source/command.cc
+++ b/crawl-ref/source/command.cc
@@ -285,9 +285,9 @@ static void _print_version(void)
 
 void adjust(void)
 {
-    mpr( "Adjust (i)tems, (s)pells, or (a)bilities?", MSGCH_PROMPT );
+    mpr("Adjust (i)tems, (s)pells, or (a)bilities? ", MSGCH_PROMPT);
 
-    const int keyin = tolower( get_ch() );
+    const int keyin = tolower(get_ch());
 
     if (keyin == 'i')
         _adjust_item();
@@ -296,10 +296,10 @@ void adjust(void)
     else if (keyin == 'a')
         _adjust_ability();
     else if (keyin == ESCAPE)
-        canned_msg( MSG_OK );
+        canned_msg(MSG_OK);
     else
-        canned_msg( MSG_HUH );
-}                               // end adjust()
+        canned_msg(MSG_HUH);
+}
 
 void swap_inv_slots(int from_slot, int to_slot, bool verbose)
 {
@@ -351,20 +351,20 @@ static void _adjust_item(void)
         return;
     }
 
-    from_slot = prompt_invent_item( "Adjust which item?", MT_INVLIST, -1 );
+    from_slot = prompt_invent_item("Adjust which item?", MT_INVLIST, -1);
     if (prompt_failed(from_slot))
         return;
 
     mpr(you.inv[from_slot].name(DESC_INVENTORY_EQUIP).c_str());
 
-    to_slot = prompt_invent_item( "Adjust to which letter?",
-                                  MT_INVLIST,
-                                  -1,
-                                  false,
-                                  false );
+    to_slot = prompt_invent_item("Adjust to which letter? ",
+                                 MT_INVLIST,
+                                 -1,
+                                 false,
+                                 false);
     if (to_slot == PROMPT_ABORT)
     {
-        canned_msg( MSG_OK );
+        canned_msg(MSG_OK);
         return;
     }
 
@@ -380,7 +380,7 @@ static void _adjust_spells(void)
     }
 
     // Select starting slot
-    mpr("Adjust which spell?", MSGCH_PROMPT);
+    mpr("Adjust which spell? ", MSGCH_PROMPT);
 
     int keyin = 0;
     if (Options.auto_list)
@@ -394,7 +394,7 @@ static void _adjust_spells(void)
 
     if (!isalpha(keyin))
     {
-        canned_msg( MSG_OK );
+        canned_msg(MSG_OK);
         return;
     }
 
@@ -413,9 +413,9 @@ static void _adjust_spells(void)
 
     // Select target slot.
     keyin = 0;
-    while ( !isalpha(keyin) )
+    while (!isalpha(keyin))
     {
-        mpr( "Adjust to which letter?", MSGCH_PROMPT );
+        mpr("Adjust to which letter? ", MSGCH_PROMPT);
         keyin = get_ch();
         if (keyin == ESCAPE)
         {
@@ -427,7 +427,7 @@ static void _adjust_spells(void)
     }
 
     const int input_2 = keyin;
-    const int index_2 = letter_to_index( keyin );
+    const int index_2 = letter_to_index(keyin);
 
     // swap references in the letter table:
     const int tmp = you.spell_letter_table[index_2];
@@ -442,34 +442,32 @@ static void _adjust_spells(void)
 
     if (spell != SPELL_NO_SPELL)
         mprf("%c - %s", input_1, spell_title(spell) );
-}                               // end _adjust_spells()
+}
 
 static void _adjust_ability(void)
 {
     const std::vector<talent> talents = your_talents(false);
 
-    if ( talents.empty() )
+    if (talents.empty())
     {
         mpr("You don't currently have any abilities.");
         return;
     }
 
     int selected = -1;
-    while ( selected < 0 )
+    while (selected < 0)
     {
-        msg::streams(MSGCH_PROMPT) << "Adjust which ability? (? or * to list)"
+        msg::streams(MSGCH_PROMPT) << "Adjust which ability? (? or * to list) "
                                    << std::endl;
 
         const int keyin = get_ch();
 
         if (keyin == '?' || keyin == '*')
-        {
             selected = choose_ability_menu(talents);
-        }
         else if (keyin == ESCAPE || keyin == ' ' ||
                  keyin == '\r' || keyin == '\n')
         {
-            canned_msg( MSG_OK );
+            canned_msg(MSG_OK);
             return;
         }
         else if (isalpha(keyin))
@@ -500,18 +498,18 @@ static void _adjust_ability(void)
 
     const int index1 = letter_to_index(talents[selected].hotkey);
 
-    msg::streams(MSGCH_PROMPT) << "Adjust to which letter?" << std::endl;
+    msg::streams(MSGCH_PROMPT) << "Adjust to which letter? " << std::endl;
 
     const int keyin = get_ch();
 
-    if ( !isalpha(keyin) )
+    if (!isalpha(keyin))
     {
         canned_msg(MSG_HUH);
         return;
     }
 
     const int index2 = letter_to_index(keyin);
-    if ( index1 == index2 )
+    if (index1 == index2)
     {
         mpr("That would be singularly pointless.");
         return;
@@ -519,9 +517,9 @@ static void _adjust_ability(void)
 
     // See if we moved something out.
     bool printed_message = false;
-    for ( unsigned int i = 0; i < talents.size(); ++i )
+    for (unsigned int i = 0; i < talents.size(); ++i)
     {
-        if ( talents[i].hotkey == keyin )
+        if (talents[i].hotkey == keyin)
         {
             msg::stream << "Swapping with: "
                         << static_cast<char>(keyin) << " - "
@@ -542,7 +540,7 @@ static void _adjust_ability(void)
     ability_type tmp = you.ability_letter_table[index2];
     you.ability_letter_table[index2] = you.ability_letter_table[index1];
     you.ability_letter_table[index1] = tmp;
-}                               // end _adjust_ability()
+}
 
 void list_armour()
 {
@@ -1507,7 +1505,7 @@ static bool _find_description(bool &again, std::string& error_inout)
     if (!error_inout.empty())
         mpr(error_inout.c_str(), MSGCH_PROMPT);
     mpr("Describe a (M)onster, (S)pell, s(K)ill, (I)tem, (F)eature, (G)od, "
-        "(A)bility, (B)ranch, or (C)ard?", MSGCH_PROMPT);
+        "(A)bility, (B)ranch, or (C)ard? ", MSGCH_PROMPT);
 
     int ch = toupper(getch());
     std::string    type;
diff --git a/crawl-ref/source/debug.cc b/crawl-ref/source/debug.cc
index 17e0d1a471..a2b5c7aaa6 100644
--- a/crawl-ref/source/debug.cc
+++ b/crawl-ref/source/debug.cc
@@ -1283,7 +1283,7 @@ void wizard_create_spec_object()
         dummy.type = mon;
 
         if (mons_genus(mon) == MONS_HYDRA)
-            dummy.number = _debug_prompt_for_int("How many heads?", false);
+            dummy.number = _debug_prompt_for_int("How many heads? ", false);
 
         if (fill_out_corpse(&dummy, mitm[thing_created], true) == -1)
         {
@@ -2142,9 +2142,10 @@ void wizard_set_hunger_state()
     std::string hunger_prompt =
         "Set hunger state to s(T)arving, (N)ear starving, (H)ungry";
     if (you.species == SP_GHOUL)
-        hunger_prompt += " or (S)atiated?";
+        hunger_prompt += " or (S)atiated";
     else
-        hunger_prompt += ", (S)atiated, (F)ull or (E)ngorged?";
+        hunger_prompt += ", (S)atiated, (F)ull or (E)ngorged";
+    hunger_prompt += "? ";
 
     mprf(MSGCH_PROMPT, "%s", hunger_prompt.c_str());
 
@@ -2546,7 +2547,7 @@ void debug_stethoscope(int mon)
     {
         mpr("Which monster?", MSGCH_PROMPT);
 
-        direction( stth );
+        direction(stth);
 
         if (!stth.isValid)
             return;
@@ -5190,7 +5191,7 @@ extern void force_monster_shout(monsters* monster);
 
 void debug_make_monster_shout(monsters* mon)
 {
-    mpr("Make the monster (S)hout or (T)alk?", MSGCH_PROMPT);
+    mpr("Make the monster (S)hout or (T)alk? ", MSGCH_PROMPT);
 
     char type = (char) getchm(KMC_DEFAULT);
     type = tolower(type);
@@ -5253,7 +5254,7 @@ static bool _force_suitable(const monsters *mon)
 
 void wizard_apply_monster_blessing(monsters* mon)
 {
-    mpr("Apply blessing of (B)eogh, The (S)hining One, or (R)andomly?",
+    mpr("Apply blessing of (B)eogh, The (S)hining One, or (R)andomly? ",
         MSGCH_PROMPT);
 
     char type = (char) getchm(KMC_DEFAULT);
diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc
index 32fbc335ef..f7afc95f16 100644
--- a/crawl-ref/source/effects.cc
+++ b/crawl-ref/source/effects.cc
@@ -2108,7 +2108,7 @@ void yell(bool force)
         mpr( "                   w - Wait here.           f - Follow me.");
    }
     mprf(" Anything else - Stay silent%s.",
-         one_chance_in(20)? " (and be thought a fool)" : "");
+         one_chance_in(20) ? " (and be thought a fool)" : "");
 
     unsigned char keyn = get_ch();
     mesclr();
diff --git a/crawl-ref/source/macro.cc b/crawl-ref/source/macro.cc
index c024a9181a..fe200e45a4 100644
--- a/crawl-ref/source/macro.cc
+++ b/crawl-ref/source/macro.cc
@@ -752,7 +752,7 @@ void macro_add_query( void )
     mesclr();
     mpr("(m)acro, keymap "
         "[(k) default, (x) level-map, (t)argeting, (c)onfirm, m(e)nu], "
-        "(s)ave?",
+        "(s)ave? ",
         MSGCH_PROMPT);
     input = m_getch();
     input = tolower( input );
@@ -816,7 +816,7 @@ void macro_add_query( void )
     if (mapref[key].size() > 0)
     {
         mprf(MSGCH_WARN, "Current Action: %s", vtostr(mapref[key]).c_str());
-        mpr( "Do you wish to (r)edefine, (c)lear, or (a)bort?", MSGCH_PROMPT );
+        mpr("Do you wish to (r)edefine, (c)lear, or (a)bort? ", MSGCH_PROMPT);
 
         input = m_getch();
 
diff --git a/crawl-ref/source/newgame.cc b/crawl-ref/source/newgame.cc
index 209a3eefae..3807133045 100644
--- a/crawl-ref/source/newgame.cc
+++ b/crawl-ref/source/newgame.cc
@@ -1236,7 +1236,7 @@ game_start:
 
         if (_check_saved_game())
         {
-            cprintf(EOL "Do you really want to overwrite your old game?");
+            cprintf(EOL "Do you really want to overwrite your old game? ");
             char c = getch();
             if (c != 'Y' && c != 'y')
             {
diff --git a/crawl-ref/source/quiver.cc b/crawl-ref/source/quiver.cc
index 315db5edcc..5a7594f2b5 100644
--- a/crawl-ref/source/quiver.cc
+++ b/crawl-ref/source/quiver.cc
@@ -144,10 +144,10 @@ void player_quiver::empty_quiver(ammo_t ammo_type)
 
 void choose_item_for_quiver()
 {
-    int slot = prompt_invent_item( "Quiver which item? (- for none, * to show all)",
-                                   MT_INVLIST,
-                                   OSEL_THROWABLE, true, true, true, '-',
-                                   you.equip[EQ_WEAPON], NULL, OPER_QUIVER );
+    int slot = prompt_invent_item("Quiver which item? (- for none, * to show all)",
+                                  MT_INVLIST,
+                                  OSEL_THROWABLE, true, true, true, '-',
+                                  you.equip[EQ_WEAPON], NULL, OPER_QUIVER);
 
     if (prompt_failed(slot))
         return;
diff --git a/crawl-ref/source/spells2.cc b/crawl-ref/source/spells2.cc
index 8e9bf686b3..76db1935e1 100644
--- a/crawl-ref/source/spells2.cc
+++ b/crawl-ref/source/spells2.cc
@@ -1255,7 +1255,7 @@ bool cast_summon_elemental(int pow, god_type god,
 
     while (true)
     {
-        mpr("Summon from material in which direction?", MSGCH_PROMPT);
+        mpr("Summon from material in which direction? ", MSGCH_PROMPT);
 
         direction(smove, DIR_DIR, TARG_ANY);
 
diff --git a/crawl-ref/source/spells3.cc b/crawl-ref/source/spells3.cc
index 66ab9a0cdb..4797251ab2 100644
--- a/crawl-ref/source/spells3.cc
+++ b/crawl-ref/source/spells3.cc
@@ -2004,7 +2004,7 @@ int portal()
         return 1;
     }
 
-    mpr("Which direction ('<' for up, '>' for down, 'x' to quit)?",
+    mpr("Which direction ('<' for up, '>' for down, 'x' to quit)? ",
         MSGCH_PROMPT);
 
     int dir_sign = 0;
@@ -2036,7 +2036,7 @@ int portal()
         }
     }
 
-    mpr("How many levels (1 - 9, 'x' to quit)?", MSGCH_PROMPT);
+    mpr("How many levels (1 - 9, 'x' to quit)? ", MSGCH_PROMPT);
 
     int amount = 0;
     while (amount == 0)
diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc
index 619b67d864..36cc192fd3 100644
--- a/crawl-ref/source/spl-cast.cc
+++ b/crawl-ref/source/spl-cast.cc
@@ -1149,7 +1149,7 @@ spret_type your_spells(spell_type spell, int powc, bool allow_fail)
                 return (SPRET_ABORT);
         }
         else if (dir == DIR_DIR)
-            mpr(prompt ? prompt : "Which direction?", MSGCH_PROMPT);
+            mpr(prompt ? prompt : "Which direction? ", MSGCH_PROMPT);
 
         const bool needs_path = (!testbits(flags, SPFLAG_GRID)
                                  && !testbits(flags, SPFLAG_TARGET));