summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/orb.cc
diff options
context:
space:
mode:
authorAdam Borowski <kilobyte@angband.pl>2013-11-28 23:33:32 +0100
committerAdam Borowski <kilobyte@angband.pl>2013-11-29 01:07:35 +0100
commit5f4ae1ef05d92d9da03cde00b07d187f2f53a06d (patch)
tree01dbc85606ad5ab882333b1695c915b63e97b96d /crawl-ref/source/orb.cc
parent2965f04181dcb6530b93acb194ba5f7561d8adc9 (diff)
downloadcrawl-ref-5f4ae1ef05d92d9da03cde00b07d187f2f53a06d.tar.gz
crawl-ref-5f4ae1ef05d92d9da03cde00b07d187f2f53a06d.zip
Replace `mpr(s, ch)` with `mprf(ch, s)`
Also simplify quite a few cases. It turns out in >90% cases of non-literals the argument had .c_str(), which meant it was pointlessly malloc()ed and converted from and to std::string. I believe a sprintf is faster, so even the argument of miniscule speed-up doesn't apply.
Diffstat (limited to 'crawl-ref/source/orb.cc')
-rw-r--r--crawl-ref/source/orb.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/crawl-ref/source/orb.cc b/crawl-ref/source/orb.cc
index 119fe06aeb..f04df9f69a 100644
--- a/crawl-ref/source/orb.cc
+++ b/crawl-ref/source/orb.cc
@@ -57,15 +57,15 @@ void orb_pickup_noise(const coord_def& where, int loudness, const char* msg, con
if (_orb_noise(where, loudness))
{
if (msg)
- mpr(msg, MSGCH_ORB);
+ mprf(MSGCH_ORB, "%s", msg);
else
- mpr("The orb lets out a hideous shriek!", MSGCH_ORB);
+ mprf(MSGCH_ORB, "The orb lets out a hideous shriek!");
}
else
{
if (msg2)
- mpr(msg2, MSGCH_ORB);
+ mprf(MSGCH_ORB, "%s", msg2);
else
- mpr("The orb lets out a furious burst of light!", MSGCH_ORB);
+ mprf(MSGCH_ORB, "The orb lets out a furious burst of light!");
}
}