summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/wiz-mon.cc
diff options
context:
space:
mode:
authorAdam Borowski <kilobyte@angband.pl>2013-11-28 17:39:14 +0100
committerAdam Borowski <kilobyte@angband.pl>2013-11-29 01:07:35 +0100
commit2965f04181dcb6530b93acb194ba5f7561d8adc9 (patch)
tree3bde1791031add1297e063a2c1d1458d300f30ba /crawl-ref/source/wiz-mon.cc
parentdbdbaf16e9ad6400c5232cd3b87583acfc996267 (diff)
downloadcrawl-ref-2965f04181dcb6530b93acb194ba5f7561d8adc9.tar.gz
crawl-ref-2965f04181dcb6530b93acb194ba5f7561d8adc9.zip
Revert "Replace `mprf(ch, s)` with `mpr(s, ch)`"
It trades readability and consistency for an utterly negligible bit of speed. With the amount of further processing mpr() does, a single sprintf is nothing. This reverts commit d9dfa8fc9755fb0a4e8954c7eb94f32fe97b82e0.
Diffstat (limited to 'crawl-ref/source/wiz-mon.cc')
-rw-r--r--crawl-ref/source/wiz-mon.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/crawl-ref/source/wiz-mon.cc b/crawl-ref/source/wiz-mon.cc
index 0a482c7d8c..e4381bd3db 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))
{
- mpr("WARNING: Monster has MF_HARD_RESET and all its "
- "items will disappear when it does.", MSGCH_WARN);
+ mprf(MSGCH_WARN, "WARNING: Monster has MF_HARD_RESET and all its "
+ "items will disappear when it does.");
}
else if ((item.flags & ISFLAG_SUMMONED) && !mon->is_summoned())
{
- mpr("WARNING: Item is summoned and will disappear when "
- "the monster does.", MSGCH_WARN);
+ mprf(MSGCH_WARN, "WARNING: Item is summoned and will disappear when "
+ "the monster does.");
}
// 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)
{
- mpr("WARNING: Item is summoned and shouldn't really be anywhere "
- "but in the inventory of a summoned monster.", MSGCH_WARN);
+ mprf(MSGCH_WARN, "WARNING: Item is summoned and shouldn't really "
+ "be anywhere but in the inventory of a summoned monster.");
}
mitm[old_eq].pos.reset();
mitm[old_eq].link = NON_ITEM;