summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/mpr.h
diff options
context:
space:
mode:
authorAdam Borowski <kilobyte@angband.pl>2012-08-09 14:05:34 +0200
committerAdam Borowski <kilobyte@angband.pl>2012-08-09 14:35:28 +0200
commitda49e36a81d2d0adbc7af12597f77978f3188478 (patch)
tree0540f2adb57f101df17f3c5edd11883361b1f858 /crawl-ref/source/mpr.h
parent4a61b4e1c3ef69e9c138c941a127877e223cb338 (diff)
downloadcrawl-ref-da49e36a81d2d0adbc7af12597f77978f3188478.tar.gz
crawl-ref-da49e36a81d2d0adbc7af12597f77978f3188478.zip
Make inline functions static.
This avoids unnecessary non-inlined copies. Also, we had a few large functions that had no reason for inlining, let's have them be regular ones. I also made "static inline" always use the same order, for easier grepping.
Diffstat (limited to 'crawl-ref/source/mpr.h')
-rw-r--r--crawl-ref/source/mpr.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/mpr.h b/crawl-ref/source/mpr.h
index b64d9660af..055526fc6f 100644
--- a/crawl-ref/source/mpr.h
+++ b/crawl-ref/source/mpr.h
@@ -85,13 +85,13 @@ msg_colour_type msg_colour(int colour);
void mpr(std::string text, msg_channel_type channel=MSGCH_PLAIN, int param=0,
bool nojoin=false, bool cap=true);
-inline void mprnojoin(std::string text, msg_channel_type channel=MSGCH_PLAIN,
+static inline void mprnojoin(std::string text, msg_channel_type channel=MSGCH_PLAIN,
int param=0)
{
mpr(text, channel, param, true);
}
-inline void mpr_nocap(std::string text, msg_channel_type channel=MSGCH_PLAIN,
+static inline void mpr_nocap(std::string text, msg_channel_type channel=MSGCH_PLAIN,
int param=0, bool nojoin=false)
{
mpr(text, channel, param, nojoin, false);