Remove mpr_nocap().

No particular reason, other than consistency.  And all but two used wasteful
double-conversion, so this is not a speed regression.

13 files changed, 19 insertions, 27 deletions

diff --git a/crawl-ref/source/command.cc b/crawl-ref/source/command.cc
index 7f054a0a85..e3e91a7690 100644
--- a/crawl-ref/source/command.cc
+++ b/crawl-ref/source/command.cc
@@ -261,10 +261,10 @@ void swap_inv_slots(int from_slot, int to_slot, bool verbose)
 
     if (verbose)
     {
-        mpr_nocap(you.inv[to_slot].name(DESC_INVENTORY_EQUIP).c_str());
+        mprf_nocap("%s", you.inv[to_slot].name(DESC_INVENTORY_EQUIP).c_str());
 
         if (you.inv[from_slot].defined())
-            mpr_nocap(you.inv[from_slot].name(DESC_INVENTORY_EQUIP).c_str());
+            mprf_nocap("%s", you.inv[from_slot].name(DESC_INVENTORY_EQUIP).c_str());
     }
 
     if (to_slot == you.equip[EQ_WEAPON] || from_slot == you.equip[EQ_WEAPON])
@@ -294,7 +294,7 @@ static void _adjust_item(void)
     if (prompt_failed(from_slot))
         return;
 
-    mpr_nocap(you.inv[from_slot].name(DESC_INVENTORY_EQUIP).c_str());
+    mprf_nocap("%s", you.inv[from_slot].name(DESC_INVENTORY_EQUIP).c_str());
 
     to_slot = prompt_invent_item("Adjust to which letter? ",
                                  MT_INVLIST,
diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc
index 84a42ee2e1..5883520647 100644
--- a/crawl-ref/source/describe.cc
+++ b/crawl-ref/source/describe.cc
@@ -2709,7 +2709,7 @@ static void _safe_newline()
 void inscribe_item(item_def &item, bool msgwin)
 {
     if (msgwin)
-        mpr_nocap(item.name(DESC_INVENTORY).c_str(), MSGCH_EQUIPMENT);
+        mprf_nocap(MSGCH_EQUIPMENT, "%s", item.name(DESC_INVENTORY).c_str());
 
     const bool is_inscribed = !item.inscription.empty();
     string prompt = is_inscribed ? "Replace inscription with what? "
@@ -2755,7 +2755,7 @@ void inscribe_item(item_def &item, bool msgwin)
 
     if (msgwin)
     {
-        mpr_nocap(item.name(DESC_INVENTORY).c_str(), MSGCH_EQUIPMENT);
+        mprf_nocap(MSGCH_EQUIPMENT, "%s", item.name(DESC_INVENTORY).c_str());
         you.wield_change  = true;
         you.redraw_quiver = true;
     }
diff --git a/crawl-ref/source/godpassive.cc b/crawl-ref/source/godpassive.cc
index 61fb8145af..a6e1e58140 100644
--- a/crawl-ref/source/godpassive.cc
+++ b/crawl-ref/source/godpassive.cc
@@ -497,7 +497,7 @@ bool god_id_item(item_def& item, bool silent)
             you.wield_change = true;
 
         if (!silent)
-            mpr_nocap(item.name(DESC_INVENTORY_EQUIP).c_str());
+            mprf_nocap("%s", item.name(DESC_INVENTORY_EQUIP).c_str());
 
         seen_item(item);
         return true;
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc
index 37447f5c29..cdd1cd4abe 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -216,7 +216,7 @@ bool can_wield(item_def *weapon, bool say_reason,
         {
             set_ident_flags(*weapon, ISFLAG_KNOW_TYPE);
             if (in_inventory(*weapon))
-                mpr_nocap(weapon->name(DESC_INVENTORY_EQUIP).c_str());
+                mprf_nocap("%s", weapon->name(DESC_INVENTORY_EQUIP).c_str());
         }
         else if (is_artefact(*weapon) && !item_type_known(*weapon))
             artefact_wpn_learn_prop(*weapon, ARTP_BRAND);
@@ -429,7 +429,7 @@ bool wield_weapon(bool auto_wield, int slot, bool show_weff_messages,
     equip_item(EQ_WEAPON, item_slot, show_weff_messages);
 
     if (show_wield_msg)
-        mpr_nocap(new_wpn.name(DESC_INVENTORY_EQUIP).c_str());
+        mprf_nocap("%s", new_wpn.name(DESC_INVENTORY_EQUIP).c_str());
 
     check_item_hint(new_wpn, old_talents);
 
@@ -1989,7 +1989,7 @@ void zap_wand(int slot)
         if (wand.sub_type == WAND_RANDOM_EFFECTS)
             mpr("You feel that this wand is rather unreliable.");
 
-        mpr_nocap(wand.name(DESC_INVENTORY_EQUIP).c_str());
+        mprf_nocap("%s", wand.name(DESC_INVENTORY_EQUIP).c_str());
     }
 
     if (item_type_known(wand)
diff --git a/crawl-ref/source/itemprop.cc b/crawl-ref/source/itemprop.cc
index 80b38f32e2..6b9356b845 100644
--- a/crawl-ref/source/itemprop.cc
+++ b/crawl-ref/source/itemprop.cc
@@ -500,7 +500,7 @@ void do_curse_item(item_def &item, bool quiet)
             else
                 set_ident_flags(item, ISFLAG_KNOW_TYPE);
 
-            mpr_nocap(item.name(DESC_INVENTORY_EQUIP).c_str());
+            mprf_nocap("%s", item.name(DESC_INVENTORY_EQUIP).c_str());
         }
         return;
     }
diff --git a/crawl-ref/source/items.cc b/crawl-ref/source/items.cc
index 62bd2ca4e5..bd6278a563 100644
--- a/crawl-ref/source/items.cc
+++ b/crawl-ref/source/items.cc
@@ -804,8 +804,7 @@ void item_check(bool verbose)
         for (unsigned int i = 0; i < items.size(); ++i)
         {
             item_def it(*items[i]);
-            string name = get_menu_colour_prefix_tags(it, DESC_A);
-            mpr_nocap(name);
+            mprf_nocap("%s", get_menu_colour_prefix_tags(it, DESC_A).c_str());
             _maybe_give_corpse_hint(it);
         }
     }
@@ -1817,8 +1816,8 @@ int move_item_to_player(int obj, int quant_got, bool quiet,
 
     if (!quiet)
     {
-        mpr_nocap(get_menu_colour_prefix_tags(you.inv[freeslot],
-                                              DESC_INVENTORY).c_str());
+        mprf_nocap("%s", get_menu_colour_prefix_tags(you.inv[freeslot],
+                   DESC_INVENTORY).c_str());
     }
     if (crawl_state.game_is_hints())
     {
diff --git a/crawl-ref/source/message.cc b/crawl-ref/source/message.cc
index 43e4cd8902..48997ab811 100644
--- a/crawl-ref/source/message.cc
+++ b/crawl-ref/source/message.cc
@@ -54,11 +54,6 @@ void mpr_nojoin(msg_channel_type channel, string text)
     _mpr(text, channel, 0, true);
 }
 
-void mpr_nocap(string text, msg_channel_type channel, int param, bool nojoin)
-{
-    _mpr(text, channel, param, nojoin, false);
-}
-
 static bool _ends_in_punctuation(const string& text)
 {
     switch (text[text.size() - 1])
diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc
index 87593ac94f..671fb2351d 100644
--- a/crawl-ref/source/misc.cc
+++ b/crawl-ref/source/misc.cc
@@ -1658,7 +1658,7 @@ void list_shop_types()
 {
     mpr_nojoin(MSGCH_PLAIN, "Available shop types: ");
     for (unsigned i = 0; i < ARRAYSZ(shop_types); ++i)
-        mpr_nocap(shop_types[i]);
+        mprf_nocap("%s", shop_types[i]);
 }
 
 // General threat = sum_of_logexpervalues_of_nearby_unfriendly_monsters.
diff --git a/crawl-ref/source/mpr.h b/crawl-ref/source/mpr.h
index 7c05e85fd4..0e2d14f5d8 100644
--- a/crawl-ref/source/mpr.h
+++ b/crawl-ref/source/mpr.h
@@ -88,8 +88,6 @@ msg_colour_type msg_colour(int colour);
 
 void mpr(string text);
 void mpr_nojoin(msg_channel_type channel, string text);
-void mpr_nocap(string text, msg_channel_type channel=MSGCH_PLAIN,
-               int param=0, bool nojoin=false);
 
 // 4.1-style mpr, currently named mprf for minimal disruption.
 void mprf(msg_channel_type channel, int param, PRINTF(2, ));
diff --git a/crawl-ref/source/player-equip.cc b/crawl-ref/source/player-equip.cc
index 83b175a377..c6ea4ca77f 100644
--- a/crawl-ref/source/player-equip.cc
+++ b/crawl-ref/source/player-equip.cc
@@ -1484,7 +1484,7 @@ static void _equip_jewellery_effect(item_def &item, bool unmeld)
     // Cursed or not, we know that since we've put the ring on.
     set_ident_flags(item, ISFLAG_KNOW_CURSE);
 
-    mpr_nocap(item.name(DESC_INVENTORY_EQUIP).c_str());
+    mprf_nocap("%s", item.name(DESC_INVENTORY_EQUIP).c_str());
 }
 
 static void _unequip_jewellery_effect(item_def &item, bool mesg, bool meld)
diff --git a/crawl-ref/source/spl-goditem.cc b/crawl-ref/source/spl-goditem.cc
index 27a56a1759..a401f448c7 100644
--- a/crawl-ref/source/spl-goditem.cc
+++ b/crawl-ref/source/spl-goditem.cc
@@ -101,7 +101,7 @@ int identify(int power, int item_slot, string *pre_msg)
         }
 
         // Output identified item.
-        mpr_nocap(item.name(DESC_INVENTORY_EQUIP).c_str());
+        mprf_nocap("%s", item.name(DESC_INVENTORY_EQUIP).c_str());
         if (item_slot == you.equip[EQ_WEAPON])
             you.wield_change = true;
 
diff --git a/crawl-ref/source/travel.cc b/crawl-ref/source/travel.cc
index 49408e31ab..5dae3e4977 100644
--- a/crawl-ref/source/travel.cc
+++ b/crawl-ref/source/travel.cc
@@ -3023,7 +3023,7 @@ void start_explore(bool grab_items)
                 mpr_nojoin(MSGCH_FLOOR_ITEMS, "Things which can be sacrificed:");
                 for (stack_iterator si(you.visible_igrd(you.pos())); si; ++si)
                     if (si->is_greedy_sacrificeable())
-                        mpr_nocap(get_menu_colour_prefix_tags(*si, DESC_A));
+                        mprf_nocap("%s", get_menu_colour_prefix_tags(*si, DESC_A).c_str());
 
             }
 
diff --git a/crawl-ref/source/wiz-item.cc b/crawl-ref/source/wiz-item.cc
index cb76341a0c..914541031b 100644
--- a/crawl-ref/source/wiz-item.cc
+++ b/crawl-ref/source/wiz-item.cc
@@ -467,7 +467,7 @@ void wizard_tweak_object(void)
 
         while (true)
         {
-            mpr_nocap(you.inv[item].name(DESC_INVENTORY_EQUIP).c_str());
+            mprf_nocap("%s", you.inv[item].name(DESC_INVENTORY_EQUIP).c_str());
 
             mprf(MSGCH_PROMPT, "a - plus  b - plus2  c - %s  "
                                "d - quantity  e - flags  ESC - exit",
@@ -719,7 +719,7 @@ void wizard_make_object_randart()
     if (eq != EQ_NONE)
         equip_item(eq, invslot);
 
-    mpr_nocap(item.name(DESC_INVENTORY_EQUIP).c_str());
+    mprf_nocap("%s", item.name(DESC_INVENTORY_EQUIP).c_str());
 }
 
 // Returns whether an item of this type can be cursed.