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 | 72c2b335f28c212203c9a7a54ccf1e9fda117c0d (patch) | |
tree | 1b23eeb3628fd0bfa0f1d4800414e619aaf8a849 | |
parent | 13de943e3c8a939d7652b614894fc9d900461ade (diff) | |
download | crawl-ref-72c2b335f28c212203c9a7a54ccf1e9fda117c0d.tar.gz crawl-ref-72c2b335f28c212203c9a7a54ccf1e9fda117c0d.zip |
Replace `mprf(s)` with `mpr(s)`
Scripted, then manually reviewed.
-rw-r--r-- | crawl-ref/source/abl-show.cc | 4 | ||||
-rw-r--r-- | crawl-ref/source/beam.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/behold.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/chardump.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/dbg-maps.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/delay.cc | 4 | ||||
-rw-r--r-- | crawl-ref/source/dgl-message.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/directn.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/dungeon.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/fearmonger.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/godabil.cc | 4 | ||||
-rw-r--r-- | crawl-ref/source/item_use.cc | 4 | ||||
-rw-r--r-- | crawl-ref/source/items.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/melee_attack.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/mon-abil.cc | 10 | ||||
-rw-r--r-- | crawl-ref/source/mon-stuff.cc | 4 | ||||
-rw-r--r-- | crawl-ref/source/player-act.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/player.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/spl-other.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/wiz-dgn.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/wiz-fsim.cc | 10 |
21 files changed, 34 insertions, 34 deletions
diff --git a/crawl-ref/source/abl-show.cc b/crawl-ref/source/abl-show.cc index 48281cec46..34e335ce6a 100644 --- a/crawl-ref/source/abl-show.cc +++ b/crawl-ref/source/abl-show.cc @@ -1461,7 +1461,7 @@ static bool _check_ability_possible(const ability_def& abil, && !player_rotted()) { if (!quiet) - mprf("You don't need to restore your stats or hit points!"); + mpr("You don't need to restore your stats or hit points!"); return false; } return true; @@ -2717,7 +2717,7 @@ static bool _do_ability(const ability_def& abil) if (retval <= 0) { if (retval == 0) - mprf("No corpses are in range."); + mpr("No corpses are in range."); else canned_msg(MSG_OK); return false; diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index b31c32ef1d..1a668589f1 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -2550,7 +2550,7 @@ void bolt::affect_endpoint() { if (you.see_cell(pos())) { - mprf("The wave splashes down."); + mpr("The wave splashes down."); noisy(25, pos()); } else diff --git a/crawl-ref/source/behold.cc b/crawl-ref/source/behold.cc index a1f9531624..7c4f212948 100644 --- a/crawl-ref/source/behold.cc +++ b/crawl-ref/source/behold.cc @@ -133,7 +133,7 @@ void player::beholders_check_noise(int loudness, bool axe) if (loudness >= 20 && beheld()) { - mprf("For a moment, your mind becomes perfectly clear!"); + mpr("For a moment, your mind becomes perfectly clear!"); clear_beholders(); _removed_beholder(); } diff --git a/crawl-ref/source/chardump.cc b/crawl-ref/source/chardump.cc index 13e6a62074..e5de627b01 100644 --- a/crawl-ref/source/chardump.cc +++ b/crawl-ref/source/chardump.cc @@ -1516,7 +1516,7 @@ static bool _write_dump(const string &fname, dump_params &par, bool quiet) succeeded = true; if (!quiet) #ifdef DGAMELAUNCH - mprf("Char dumped successfully."); + mpr("Char dumped successfully."); #else mprf("Char dumped to '%s'.", file_name.c_str()); #endif diff --git a/crawl-ref/source/dbg-maps.cc b/crawl-ref/source/dbg-maps.cc index 214195d9ba..a335a3732c 100644 --- a/crawl-ref/source/dbg-maps.cc +++ b/crawl-ref/source/dbg-maps.cc @@ -191,7 +191,7 @@ static bool mg_build_dungeon() static void mg_build_levels(int niters) { mesclr(); - mprf("Generating dungeon map stats"); + mpr("Generating dungeon map stats"); for (int i = 0; i < niters; ++i) { diff --git a/crawl-ref/source/delay.cc b/crawl-ref/source/delay.cc index 06b8bdea8b..721d289e48 100644 --- a/crawl-ref/source/delay.cc +++ b/crawl-ref/source/delay.cc @@ -969,7 +969,7 @@ static void _finish_delay(const delay_queue_item &delay) case DELAY_EAT: if (delay.parm3 > 0) // If duration was just one turn, don't print. - mprf("You finish eating."); + mpr("You finish eating."); // For chunks, warn the player if they're not getting much // nutrition. Also, print the other eating messages only now. if (delay.parm1) @@ -980,7 +980,7 @@ static void _finish_delay(const delay_queue_item &delay) case DELAY_FEED_VAMPIRE: { - mprf("You finish drinking."); + mpr("You finish drinking."); did_god_conduct(DID_DRINK_BLOOD, 8); diff --git a/crawl-ref/source/dgl-message.cc b/crawl-ref/source/dgl-message.cc index 255d99505c..dbb4803300 100644 --- a/crawl-ref/source/dgl-message.cc +++ b/crawl-ref/source/dgl-message.cc @@ -123,7 +123,7 @@ void read_messages() static void _announce_messages() { // XXX: We could do a NetHack-like mail daemon here at some point. - mprf("Beep! Your pager goes off! Use _ to check your messages."); + mpr("Beep! Your pager goes off! Use _ to check your messages."); } void check_messages() diff --git a/crawl-ref/source/directn.cc b/crawl-ref/source/directn.cc index be47f619cd..d5e893f72e 100644 --- a/crawl-ref/source/directn.cc +++ b/crawl-ref/source/directn.cc @@ -572,7 +572,7 @@ void full_describe_view() if (list_mons.empty() && list_items.empty() && list_features.empty()) { - mprf("No monsters, items or features are visible."); + mpr("No monsters, items or features are visible."); return; } diff --git a/crawl-ref/source/dungeon.cc b/crawl-ref/source/dungeon.cc index 46044bac56..7f7ed7062c 100644 --- a/crawl-ref/source/dungeon.cc +++ b/crawl-ref/source/dungeon.cc @@ -3103,7 +3103,7 @@ static void _slime_connectivity_fixup() // squares should have adjacency of DISCONNECT_DIST // but oh well if (env.level_map_mask(*adj_it) & MMT_VAULT) - mprf("Whoops, nicked a vault in slime connectivity fixup"); + mpr("Whoops, nicked a vault in slime connectivity fixup"); env.grid(*adj_it) = DNGN_FLOOR; } } diff --git a/crawl-ref/source/fearmonger.cc b/crawl-ref/source/fearmonger.cc index 591b3a262f..3c12989937 100644 --- a/crawl-ref/source/fearmonger.cc +++ b/crawl-ref/source/fearmonger.cc @@ -115,7 +115,7 @@ void player::fearmongers_check_noise(int loudness, bool axe) if (loudness >= 20 && beheld()) { - mprf("For a moment, your terror fades away!"); + mpr("For a moment, your terror fades away!"); clear_fearmongers(); _removed_fearmonger(); } diff --git a/crawl-ref/source/godabil.cc b/crawl-ref/source/godabil.cc index 0f230c445e..40f13bb797 100644 --- a/crawl-ref/source/godabil.cc +++ b/crawl-ref/source/godabil.cc @@ -3375,7 +3375,7 @@ void spare_beogh_convert() mpr("The priest welcomes you and lets you live."); else { - mprf("With a roar of approval, the orcs welcome you as one of their own, " - "and spare your life."); + mpr("With a roar of approval, the orcs welcome you as one of their own," + " and spare your life."); } } diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index 6dd1580abb..37447f5c29 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -657,7 +657,7 @@ bool can_wear_armour(const item_def &item, bool verbose, bool ignore_temporary) || player_mutation_level(MUT_CLAWS, false) >= 3) { if (verbose) - mprf("The hauberk won't fit your hands."); + mpr("The hauberk won't fit your hands."); return false; } @@ -665,7 +665,7 @@ bool can_wear_armour(const item_def &item, bool verbose, bool ignore_temporary) || player_mutation_level(MUT_ANTENNAE, false) >= 3) { if (verbose) - mprf("The hauberk won't fit your head."); + mpr("The hauberk won't fit your head."); return false; } } diff --git a/crawl-ref/source/items.cc b/crawl-ref/source/items.cc index 8140d4a4eb..ab3f6838f1 100644 --- a/crawl-ref/source/items.cc +++ b/crawl-ref/source/items.cc @@ -2233,7 +2233,7 @@ void drop_last() } if (items_to_drop.empty()) - mprf("No item to drop."); + mpr("No item to drop."); else { you.last_pickup.clear(); diff --git a/crawl-ref/source/melee_attack.cc b/crawl-ref/source/melee_attack.cc index 73c8f3190f..2bd418f10c 100644 --- a/crawl-ref/source/melee_attack.cc +++ b/crawl-ref/source/melee_attack.cc @@ -308,7 +308,7 @@ bool melee_attack::handle_phase_attempted() if (defender && you.can_see(defender)) mprf("You jump-attack %s!", defender->name(DESC_THE).c_str()); else - mprf("You jump-attack!"); + mpr("You jump-attack!"); if (jump_blocked) { mpr("Something unseen blocks your movement!"); diff --git a/crawl-ref/source/mon-abil.cc b/crawl-ref/source/mon-abil.cc index 0dff19e975..3cc1f59bdb 100644 --- a/crawl-ref/source/mon-abil.cc +++ b/crawl-ref/source/mon-abil.cc @@ -1028,7 +1028,7 @@ static bool _siren_movement_effect(const monster* mons) if (!do_resist) { const coord_def oldpos = you.pos(); - mprf("The pull of her song draws you forwards."); + mpr("The pull of her song draws you forwards."); if (swapping) { @@ -2301,7 +2301,7 @@ static void _establish_connection(int tentacle, if (!last_mon) { // Should be something there, what to do if there isn't? - mprf("Error! failed to place monster in tentacle connect change"); + mpr("Error! failed to place monster in tentacle connect change"); break; } int last_mon_idx = last_mon->mindex(); @@ -2809,7 +2809,7 @@ static int _collect_connection_data(monster* start_monster, { current_mon = &menv[next_idx]; if (int(current_mon->number) != start_monster->mindex()) - mprf("link information corruption!!! tentacle in chain doesn't match mindex"); + mpr("link information corruption!!! tentacle in chain doesn't match mindex"); if (!retract_found) { retract_pos = current_mon->pos(); @@ -4590,7 +4590,7 @@ void ballisto_on_move(monster* mons, const coord_def& position) // Don't leave mold on squares we place ballistos on remove_mold(position); if (you.can_see(plant)) - mprf("A ballistomycete grows in the wake of the spore."); + mpr("A ballistomycete grows in the wake of the spore."); } mons->number = 40; @@ -5016,7 +5016,7 @@ void waterport_touch(monster* nymph, actor* target) nymph->pronoun(PRONOUN_POSSESSIVE, true).c_str()); } else if (target->is_player()) - mprf("You are drawn back into the water."); + mpr("You are drawn back into the water."); else { if (could_see_victim) diff --git a/crawl-ref/source/mon-stuff.cc b/crawl-ref/source/mon-stuff.cc index 557c2563b4..4ac22a8b39 100644 --- a/crawl-ref/source/mon-stuff.cc +++ b/crawl-ref/source/mon-stuff.cc @@ -1491,7 +1491,7 @@ static void _make_spectral_thing(monster* mons, bool quiet) // Headless hydras cannot be made spectral hydras, sorry. if (spectre_type == MONS_HYDRA && mons->number == 0) { - mprf("A glowing mist gathers momentarily, then fades."); + mpr("A glowing mist gathers momentarily, then fades."); return; } @@ -2058,7 +2058,7 @@ int monster_die(monster* mons, killer_type killer, if (hp_heal && you.hp < you.hp_max && !you.duration[DUR_DEATHS_DOOR]) { - mprf("You feel a little better."); + mpr("You feel a little better."); inc_hp(hp_heal); } diff --git a/crawl-ref/source/player-act.cc b/crawl-ref/source/player-act.cc index 364f3ea74a..dfcd568ca7 100644 --- a/crawl-ref/source/player-act.cc +++ b/crawl-ref/source/player-act.cc @@ -709,7 +709,7 @@ bool player::can_go_berserk(bool intentional, bool potion, bool quiet) const if (stasis(false)) { if (verbose) - mprf("You cannot go berserk while under stasis."); + mpr("You cannot go berserk while under stasis."); return false; } diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index 78bfd9b6db..2cc60cc101 100644 --- a/crawl-ref/source/player.cc +++ b/crawl-ref/source/player.cc @@ -5568,7 +5568,7 @@ void float_player() { if (you.fishtail) { - mprf("Your tail turns into legs as you fly out of the water."); + mpr("Your tail turns into legs as you fly out of the water."); merfolk_stop_swimming(); } else if (you.tengu_flight()) diff --git a/crawl-ref/source/spl-other.cc b/crawl-ref/source/spl-other.cc index b4bad54e29..037f0f634f 100644 --- a/crawl-ref/source/spl-other.cc +++ b/crawl-ref/source/spl-other.cc @@ -493,7 +493,7 @@ spret_type cast_stoneskin(int pow, bool fail) { // We can't get here from normal casting, and probably don't want // a message from the Helm card. - // mprf("Your skin is naturally stony."); + // mpr("Your skin is naturally stony."); return SPRET_ABORT; } diff --git a/crawl-ref/source/wiz-dgn.cc b/crawl-ref/source/wiz-dgn.cc index 58949efd0b..6e9526a9cd 100644 --- a/crawl-ref/source/wiz-dgn.cc +++ b/crawl-ref/source/wiz-dgn.cc @@ -565,7 +565,7 @@ bool debug_make_shop(const coord_def& pos) place_spec_shop(pos, new_shop_type, representative); link_items(); - mprf("Done."); + mpr("Done."); return true; } diff --git a/crawl-ref/source/wiz-fsim.cc b/crawl-ref/source/wiz-fsim.cc index 78a146f4d1..bb2041deb3 100644 --- a/crawl-ref/source/wiz-fsim.cc +++ b/crawl-ref/source/wiz-fsim.cc @@ -259,7 +259,7 @@ static monster* _init_fsim() mon = create_monster(temp); if (!mon) { - mprf("Failed to create monster."); + mpr("Failed to create monster."); return NULL; } } @@ -277,7 +277,7 @@ static monster* _init_fsim() if (!adjacent(mon->pos(), you.pos())) { monster_die(mon, KILL_DISMISSED, NON_MONSTER); - mprf("Could not put monster adjacent to player."); + mpr("Could not put monster adjacent to player."); return 0; } @@ -518,7 +518,7 @@ static void _fsim_simple_scale(FILE * o, monster* mon, bool defense) // kill the loop if the user hits escape if (kbhit() && getchk() == 27) { - mprf("Cancelling simulation.\n"); + mpr("Cancelling simulation.\n"); fprintf(o, "Simulation cancelled!\n\n"); break; } @@ -564,7 +564,7 @@ static void _fsim_double_scale(FILE * o, monster* mon, bool defense) // kill the loop if the user hits escape if (kbhit() && getchk() == 27) { - mprf("Cancelling simulation.\n"); + mpr("Cancelling simulation.\n"); fprintf(o, "\nSimulation cancelled!\n\n"); return; } @@ -665,7 +665,7 @@ void wizard_fight_sim(bool double_scale) set_xl(xl, false); _uninit_fsim(mon); - mprf("Done."); + mpr("Done."); } #endif |