diff options
author | Chris Oelmueller <chris.oelmueller@gmail.com> | 2013-11-28 09:25:12 +0100 |
---|---|---|
committer | Neil Moore <neil@s-z.org> | 2013-11-28 11:16:38 -0500 |
commit | d9dfa8fc9755fb0a4e8954c7eb94f32fe97b82e0 (patch) | |
tree | 812a6f86bd142c3fd8d9215873d9060074e39754 | |
parent | 72c2b335f28c212203c9a7a54ccf1e9fda117c0d (diff) | |
download | crawl-ref-d9dfa8fc9755fb0a4e8954c7eb94f32fe97b82e0.tar.gz crawl-ref-d9dfa8fc9755fb0a4e8954c7eb94f32fe97b82e0.zip |
Replace `mprf(ch, s)` with `mpr(s, ch)`
Scripted, then manually reviewed.
-rw-r--r-- | crawl-ref/source/art-func.h | 2 | ||||
-rw-r--r-- | crawl-ref/source/dbg-maps.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/dbg-scan.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/delay.cc | 6 | ||||
-rw-r--r-- | crawl-ref/source/dgl-message.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/dgn-shoals.cc | 4 | ||||
-rw-r--r-- | crawl-ref/source/directn.cc | 4 | ||||
-rw-r--r-- | crawl-ref/source/item_use.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/main.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/mapmark.cc | 4 | ||||
-rw-r--r-- | crawl-ref/source/mon-abil.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/religion.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/terrain.cc | 10 | ||||
-rw-r--r-- | crawl-ref/source/travel.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/wiz-item.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/wiz-mon.cc | 12 | ||||
-rw-r--r-- | crawl-ref/source/wiz-you.cc | 6 | ||||
-rw-r--r-- | crawl-ref/source/xom.cc | 2 |
18 files changed, 34 insertions, 34 deletions
diff --git a/crawl-ref/source/art-func.h b/crawl-ref/source/art-func.h index b56b0bf54a..7725997947 100644 --- a/crawl-ref/source/art-func.h +++ b/crawl-ref/source/art-func.h @@ -335,7 +335,7 @@ static void _SINGING_SWORD_equip(item_def *item, bool *show_msgs, bool unmeld) if (!item->props.exists("ss_welcome")) { - mprf(MSGCH_TALK, "The sword says, \"Hi! I'm the Singing Sword!\""); + mpr("The sword says, \"Hi! I'm the Singing Sword!\"", MSGCH_TALK); item->props["ss_welcome"].get_bool() = true; } else diff --git a/crawl-ref/source/dbg-maps.cc b/crawl-ref/source/dbg-maps.cc index a335a3732c..794524d69f 100644 --- a/crawl-ref/source/dbg-maps.cc +++ b/crawl-ref/source/dbg-maps.cc @@ -82,7 +82,7 @@ static bool mg_do_build_level(int niters) { if (kbhit() && key_is_escape(getchk())) { - mprf(MSGCH_WARN, "User requested cancel"); + mpr("User requested cancel", MSGCH_WARN); return false; } diff --git a/crawl-ref/source/dbg-scan.cc b/crawl-ref/source/dbg-scan.cc index 6ebadb3c22..8a42c06752 100644 --- a/crawl-ref/source/dbg-scan.cc +++ b/crawl-ref/source/dbg-scan.cc @@ -220,7 +220,7 @@ void debug_item_scan(void) if (mons.name(DESC_PLAIN, true).find("questionable") != string::npos) { - mprf(MSGCH_ERROR, "Program bug detected!"); + mpr("Program bug detected!", MSGCH_ERROR); mprf(MSGCH_ERROR, "Buggy monster detected: monster #%d; position (%d,%d)", i, mons.pos().x, mons.pos().y); diff --git a/crawl-ref/source/delay.cc b/crawl-ref/source/delay.cc index 721d289e48..4ec608d7e7 100644 --- a/crawl-ref/source/delay.cc +++ b/crawl-ref/source/delay.cc @@ -863,7 +863,7 @@ void handle_delay() break; case DELAY_BUTCHER: - mprf(MSGCH_MULTITURN_ACTION, "You continue butchering the corpse."); + mpr("You continue butchering the corpse.", MSGCH_MULTITURN_ACTION); break; case DELAY_BOTTLE_BLOOD: @@ -916,7 +916,7 @@ void handle_delay() stop_delay(); return; } - mprf(MSGCH_MULTITURN_ACTION, "You continue drinking."); + mpr("You continue drinking.", MSGCH_MULTITURN_ACTION); vampire_nutrition_per_turn(corpse, 0); break; } @@ -1725,7 +1725,7 @@ void autotoggle_autopickup(bool off) else if (Options.autopickup_on < 0) // was turned off automatically { Options.autopickup_on = 1; - mprf(MSGCH_WARN, "Reactivating autopickup."); + mpr("Reactivating autopickup.", MSGCH_WARN); } } diff --git a/crawl-ref/source/dgl-message.cc b/crawl-ref/source/dgl-message.cc index dbb4803300..6b057f4d1a 100644 --- a/crawl-ref/source/dgl-message.cc +++ b/crawl-ref/source/dgl-message.cc @@ -84,7 +84,7 @@ static void _read_each_message() if (say_got_msg) { - mprf(MSGCH_PROMPT, "Your messages:"); + mpr("Your messages:", MSGCH_PROMPT); say_got_msg = false; } diff --git a/crawl-ref/source/dgn-shoals.cc b/crawl-ref/source/dgn-shoals.cc index 50c3f37b5c..90d4d562ed 100644 --- a/crawl-ref/source/dgn-shoals.cc +++ b/crawl-ref/source/dgn-shoals.cc @@ -1050,7 +1050,7 @@ static void _shoals_apply_tide_at(coord_def c, int tide, bool incremental_tide) && !you.ground_level() && !you.permanent_flight()) { - mprf(MSGCH_WARN, "The tide rushes in under you."); + mpr("The tide rushes in under you.", MSGCH_WARN); } } @@ -1270,7 +1270,7 @@ void wizard_mod_tide() { if (!player_in_branch(BRANCH_SHOALS) || !env.heightmap.get()) { - mprf(MSGCH_WARN, "Not in Shoals or no heightmap; tide not available."); + mpr("Not in Shoals or no heightmap; tide not available.", MSGCH_WARN); return; } diff --git a/crawl-ref/source/directn.cc b/crawl-ref/source/directn.cc index d5e893f72e..a7266c09ba 100644 --- a/crawl-ref/source/directn.cc +++ b/crawl-ref/source/directn.cc @@ -1552,7 +1552,7 @@ void direction_chooser::print_items_description() const get_menu_colour_prefix_tags(*item, DESC_A).c_str()); if (multiple_items_at(target())) - mprf(MSGCH_FLOOR_ITEMS, "There is something else lying underneath."); + mpr("There is something else lying underneath.", MSGCH_FLOOR_ITEMS); } void direction_chooser::print_floor_description(bool boring_too) const @@ -1608,7 +1608,7 @@ void direction_chooser::toggle_beam() { if (!needs_path) { - mprf(MSGCH_EXAMINE_FILTER, "This spell doesn't need a beam path."); + mpr("This spell doesn't need a beam path.", MSGCH_EXAMINE_FILTER); return; } diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index 37447f5c29..273c2e91df 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -1102,7 +1102,7 @@ static int _prompt_ring_to_remove(int new_ring) mprf(MSGCH_PROMPT, "You're wearing all the rings you can. Remove which one?"); - mprf(MSGCH_PROMPT, "(<w>?</w> for menu, <w>Esc</w> to cancel)"); + mpr("(<w>?</w> for menu, <w>Esc</w> to cancel)", MSGCH_PROMPT); // FIXME: Needs TOUCH_UI version diff --git a/crawl-ref/source/main.cc b/crawl-ref/source/main.cc index abf4827e65..40a0423c26 100644 --- a/crawl-ref/source/main.cc +++ b/crawl-ref/source/main.cc @@ -1308,7 +1308,7 @@ static void _input() if (!has_pending_input() && !kbhit()) { if (++crawl_state.lua_calls_no_turn > 1000) - mprf(MSGCH_ERROR, "Infinite lua loop detected, aborting."); + mpr("Infinite lua loop detected, aborting.", MSGCH_ERROR); else clua.callfn("ready", 0, 0); } diff --git a/crawl-ref/source/mapmark.cc b/crawl-ref/source/mapmark.cc index 7da368b3dd..a65913ab53 100644 --- a/crawl-ref/source/mapmark.cc +++ b/crawl-ref/source/mapmark.cc @@ -222,7 +222,7 @@ void map_lua_marker::check_register_table() { if (!lua_istable(dlua, -1)) { - mprf(MSGCH_ERROR, "lua_marker: Expected table, didn't get it."); + mpr("lua_marker: Expected table, didn't get it.", MSGCH_ERROR); initialised = false; return; } @@ -251,7 +251,7 @@ void map_lua_marker::write(writer &outf) const bool init = initialised; if (!get_table()) { - mprf(MSGCH_ERROR, "Couldn't find table."); + mpr("Couldn't find table.", MSGCH_ERROR); init = false; } diff --git a/crawl-ref/source/mon-abil.cc b/crawl-ref/source/mon-abil.cc index 3cc1f59bdb..8f9eff15aa 100644 --- a/crawl-ref/source/mon-abil.cc +++ b/crawl-ref/source/mon-abil.cc @@ -1115,7 +1115,7 @@ static bool _orange_statue_effects(monster* mons) if (you.can_see(foe)) { if (foe->is_player()) - mprf(MSGCH_WARN, "A hostile presence attacks your mind!"); + mpr("A hostile presence attacks your mind!", MSGCH_WARN); else if (you.can_see(mons)) mprf(MSGCH_WARN, "%s fixes %s piercing gaze on %s.", mons->name(DESC_THE).c_str(), diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index dfe86311b6..9ebb9b2fd6 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -2652,7 +2652,7 @@ static void _gain_piety_point() if (!one_chance_in(4) && !you_worship(GOD_JIYVA)) { #ifdef DEBUG_PIETY - mprf(MSGCH_DIAGNOSTICS, "Piety slowdown due to gift timeout."); + mpr("Piety slowdown due to gift timeout.", MSGCH_DIAGNOSTICS); #endif return; } diff --git a/crawl-ref/source/terrain.cc b/crawl-ref/source/terrain.cc index b7a3599597..5aa1383ed4 100644 --- a/crawl-ref/source/terrain.cc +++ b/crawl-ref/source/terrain.cc @@ -605,12 +605,12 @@ bool feat_destroys_item(dungeon_feature_type feat, const item_def &item, case DNGN_SHALLOW_WATER: case DNGN_DEEP_WATER: if (noisy) - mprf(MSGCH_SOUND, "You hear a splash."); + mpr("You hear a splash.", MSGCH_SOUND); return false; case DNGN_LAVA: if (noisy) - mprf(MSGCH_SOUND, "You hear a sizzling splash."); + mpr("You hear a sizzling splash.", MSGCH_SOUND); return true; default: @@ -627,17 +627,17 @@ bool feat_virtually_destroys_item(dungeon_feature_type feat, const item_def &ite { case DNGN_SHALLOW_WATER: if (noisy) - mprf(MSGCH_SOUND, "You hear a splash."); + mpr("You hear a splash.", MSGCH_SOUND); return false; case DNGN_DEEP_WATER: if (noisy) - mprf(MSGCH_SOUND, "You hear a splash."); + mpr("You hear a splash.", MSGCH_SOUND); return true; case DNGN_LAVA: if (noisy) - mprf(MSGCH_SOUND, "You hear a sizzling splash."); + mpr("You hear a sizzling splash.", MSGCH_SOUND); return true; default: diff --git a/crawl-ref/source/travel.cc b/crawl-ref/source/travel.cc index 1b119c2cb1..a65240906e 100644 --- a/crawl-ref/source/travel.cc +++ b/crawl-ref/source/travel.cc @@ -4074,7 +4074,7 @@ bool runrest::run_should_stop() const { #ifndef USE_TILE_LOCAL // XXX: Remove this once exclusions are visible. - mprf(MSGCH_WARN, "Stopped running for exclusion."); + mpr("Stopped running for exclusion.", MSGCH_WARN); #endif return true; } diff --git a/crawl-ref/source/wiz-item.cc b/crawl-ref/source/wiz-item.cc index 0e55bd9292..05de002c1e 100644 --- a/crawl-ref/source/wiz-item.cc +++ b/crawl-ref/source/wiz-item.cc @@ -68,7 +68,7 @@ static void _make_all_books() void wizard_create_spec_object_by_name() { char buf[1024]; - mprf(MSGCH_PROMPT, "Enter name of item (or ITEM spec): "); + mpr("Enter name of item (or ITEM spec): ", MSGCH_PROMPT); if (cancellable_get_line_autohist(buf, sizeof buf) || !*buf) { canned_msg(MSG_OK); diff --git a/crawl-ref/source/wiz-mon.cc b/crawl-ref/source/wiz-mon.cc index e4381bd3db..0a482c7d8c 100644 --- a/crawl-ref/source/wiz-mon.cc +++ b/crawl-ref/source/wiz-mon.cc @@ -1051,13 +1051,13 @@ void wizard_give_monster_item(monster* mon) if ((mon->flags & MF_HARD_RESET) && !(item.flags & ISFLAG_SUMMONED)) { - mprf(MSGCH_WARN, "WARNING: Monster has MF_HARD_RESET and all its " - "items will disappear when it does."); + mpr("WARNING: Monster has MF_HARD_RESET and all its " + "items will disappear when it does.", MSGCH_WARN); } else if ((item.flags & ISFLAG_SUMMONED) && !mon->is_summoned()) { - mprf(MSGCH_WARN, "WARNING: Item is summoned and will disappear when " - "the monster does."); + mpr("WARNING: Item is summoned and will disappear when " + "the monster does.", MSGCH_WARN); } // Monster's old item moves to player's inventory. if (old_eq != NON_ITEM) @@ -1065,8 +1065,8 @@ void wizard_give_monster_item(monster* mon) mpr("Fetching monster's old item."); if (mitm[old_eq].flags & ISFLAG_SUMMONED) { - mprf(MSGCH_WARN, "WARNING: Item is summoned and shouldn't really " - "be anywhere but in the inventory of a summoned monster."); + mpr("WARNING: Item is summoned and shouldn't really be anywhere " + "but in the inventory of a summoned monster.", MSGCH_WARN); } mitm[old_eq].pos.reset(); mitm[old_eq].link = NON_ITEM; diff --git a/crawl-ref/source/wiz-you.cc b/crawl-ref/source/wiz-you.cc index c9bb2ea7df..f3c44f0d4a 100644 --- a/crawl-ref/source/wiz-you.cc +++ b/crawl-ref/source/wiz-you.cc @@ -703,7 +703,7 @@ bool wizard_add_mutation() void wizard_set_abyss() { char buf[80]; - mprf(MSGCH_PROMPT, "Enter values for X, Y, Z (space separated) or return: "); + mpr("Enter values for X, Y, Z (space separated) or return: ", MSGCH_PROMPT); if (!cancellable_get_line_autohist(buf, sizeof buf)) abyss_teleport(true); @@ -715,7 +715,7 @@ void wizard_set_abyss() void wizard_set_stats() { char buf[80]; - mprf(MSGCH_PROMPT, "Enter values for Str, Int, Dex (space separated): "); + mpr("Enter values for Str, Int, Dex (space separated): ", MSGCH_PROMPT); if (cancellable_get_line_autohist(buf, sizeof buf)) return; @@ -1004,7 +1004,7 @@ static void debug_downtick_xl(int newxl) void wizard_set_xl() { - mprf(MSGCH_PROMPT, "Enter new experience level: "); + mpr("Enter new experience level: ", MSGCH_PROMPT); char buf[30]; if (cancellable_get_line_autohist(buf, sizeof buf)) { diff --git a/crawl-ref/source/xom.cc b/crawl-ref/source/xom.cc index 3f07193f4b..36c28c8810 100644 --- a/crawl-ref/source/xom.cc +++ b/crawl-ref/source/xom.cc @@ -4124,7 +4124,7 @@ void debug_xom_effects() FILE *ostat = fopen("xom_debug.stat", "a"); if (!ostat) { - mprf(MSGCH_ERROR, "Can't write 'xom_debug.stat'. Aborting."); + mpr("Can't write 'xom_debug.stat'. Aborting.", MSGCH_ERROR); return; } |