summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/message.cc
diff options
context:
space:
mode:
authorzelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573>2009-01-03 08:35:04 +0000
committerzelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573>2009-01-03 08:35:04 +0000
commit400b9fc5049359bf0f8b6e51c1b0561ec77cd727 (patch)
tree7b3a9947d3312b4dfce7d5de878984b9a923dcd2 /crawl-ref/source/message.cc
parent64deac3cd28c576594f9c2ea909d81b98dc3a8c2 (diff)
downloadcrawl-ref-400b9fc5049359bf0f8b6e51c1b0561ec77cd727.tar.gz
crawl-ref-400b9fc5049359bf0f8b6e51c1b0561ec77cd727.zip
Assert in mpr() during arena mode if a channel innapropriate for arena mode
is used. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8164 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/message.cc')
-rw-r--r--crawl-ref/source/message.cc27
1 files changed, 27 insertions, 0 deletions
diff --git a/crawl-ref/source/message.cc b/crawl-ref/source/message.cc
index b52aea65d1..b92e5ef174 100644
--- a/crawl-ref/source/message.cc
+++ b/crawl-ref/source/message.cc
@@ -415,6 +415,33 @@ void mprf( const char *format, ... )
void mpr(const char *inf, msg_channel_type channel, int param)
{
+ if (crawl_state.arena)
+ {
+ switch(channel)
+ {
+ case MSGCH_PROMPT:
+ case MSGCH_GOD:
+ case MSGCH_PRAY:
+ case MSGCH_DURATION:
+ case MSGCH_FOOD:
+ case MSGCH_RECOVERY:
+ case MSGCH_INTRINSIC_GAIN:
+ case MSGCH_MUTATION:
+ case MSGCH_ROTTEN_MEAT:
+ case MSGCH_EQUIPMENT:
+ case MSGCH_FLOOR_ITEMS:
+ case MSGCH_MULTITURN_ACTION:
+ case MSGCH_EXAMINE:
+ case MSGCH_EXAMINE_FILTER:
+ case MSGCH_TUTORIAL:
+ DEBUGSTR("Invalid channel '%s' in arena mode",
+ channel_to_str(channel).c_str());
+ break;
+ default:
+ break;
+ }
+ }
+
if (!crawl_state.io_inited)
{
if (channel == MSGCH_ERROR)