summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/mpr.h
diff options
context:
space:
mode:
authorRaphael Langella <raphael.langella@gmail.com>2012-08-26 22:50:06 +0200
committerRaphael Langella <raphael.langella@gmail.com>2012-08-26 23:06:30 +0200
commit770bcbd1844b97b671d0e47ea8313cdf2c74c5ea (patch)
treee030cf61afce9ca69b74bb38eb73734bf10f633e /crawl-ref/source/mpr.h
parenta6c16c7f2066c854a01f25e9e6c3d8e44282a638 (diff)
downloadcrawl-ref-770bcbd1844b97b671d0e47ea8313cdf2c74c5ea.tar.gz
crawl-ref-770bcbd1844b97b671d0e47ea8313cdf2c74c5ea.zip
Use std namespace.
I had to rename distance() (in coord.h) to distance2() because it conflicts with the STL function to compare 2 iterators. Not a bad change given how it returns the square of the distance anyway. I also had to rename the message global variable (in message.cc) to buffer. I tried to fix and improve the coding style has much as I could, but I probably missed a few given how huge and tedious it is. I also didn't touch crawl-gdb.py, and the stuff in prebuilt, rltiles/tool and util/levcomp.*, because I have no clue about those.
Diffstat (limited to 'crawl-ref/source/mpr.h')
-rw-r--r--crawl-ref/source/mpr.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/crawl-ref/source/mpr.h b/crawl-ref/source/mpr.h
index 055526fc6f..e6e0f4f944 100644
--- a/crawl-ref/source/mpr.h
+++ b/crawl-ref/source/mpr.h
@@ -82,17 +82,17 @@ enum diag_type
msg_colour_type msg_colour(int colour);
-void mpr(std::string text, msg_channel_type channel=MSGCH_PLAIN, int param=0,
+void mpr(string text, msg_channel_type channel=MSGCH_PLAIN, int param=0,
bool nojoin=false, bool cap=true);
-static inline void mprnojoin(std::string text, msg_channel_type channel=MSGCH_PLAIN,
- int param=0)
+static inline void mprnojoin(string text, msg_channel_type channel=MSGCH_PLAIN,
+ int param=0)
{
mpr(text, channel, param, true);
}
-static inline void mpr_nocap(std::string text, msg_channel_type channel=MSGCH_PLAIN,
- int param=0, bool nojoin=false)
+static inline void mpr_nocap(string text, msg_channel_type channel=MSGCH_PLAIN,
+ int param=0, bool nojoin=false)
{
mpr(text, channel, param, nojoin, false);
}