Improved joining of short messages.

They will now only be joined if they fit together in a message
line. There's still the arbitrary restriction of <= 30 characters,
though I guess that could be dropped or raised.

mpr() has an extra parameter (ugh) to disable joining.

force_more messages are guaranteed a single line.

There's now a check_join() that could be adapted to filter out
certain channels or messages, possibly by user configuration at
some point should that be necessary. For now, MSGCH_EQUIPMENT
is prevented from joining, fixing the problems with commands
[" etc, though it may affect too many messages.

If you find messages joining up that shouldn't, please add
to dcss:feedback:interface:messagewindow on the cdo wiki.

1 files changed, 8 insertions, 1 deletions

diff --git a/crawl-ref/source/mpr.h b/crawl-ref/source/mpr.h
index 295d96a782..8c65ec52f8 100644
--- a/crawl-ref/source/mpr.h
+++ b/crawl-ref/source/mpr.h
@@ -74,7 +74,14 @@ enum msg_colour_type
 
 msg_colour_type msg_colour(int colour);
 
-void mpr(std::string text, msg_channel_type channel = MSGCH_PLAIN, int param=0);
+void mpr(std::string text, msg_channel_type channel=MSGCH_PLAIN, int param=0,
+         bool nojoin=false);
+
+inline void mprnojoin(std::string text, msg_channel_type channel=MSGCH_PLAIN,
+                      int param=0)
+{
+    mpr(text, channel, param, true);
+}
 
 // 4.1-style mpr, currently named mprf for minimal disruption.
 void mprf( msg_channel_type channel, int param, const char *format, ... );