diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-04-29 20:36:26 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-04-29 20:36:26 +0000 |
| commit | bfb78773d40980efe0925662d12128ae101a7729 (patch) | |
| tree | 873ccd4c6c216704e04c2fe3583412ec3dd88184 /crawl-ref/source/message.cc | |
| parent | bee19fd8b7da68818a8d6a2d1a204308fb602efc (diff) | |
| download | crawl-ref-bfb78773d40980efe0925662d12128ae101a7729.tar.gz crawl-ref-bfb78773d40980efe0925662d12128ae101a7729.zip | |
Add two new channels, MSGCH_FRIEND_SPELL and MSGCH_FRIEND_ENCHANT,
whose sole purpose is to not interrupt resting if it's a friend doing
the spellcasting or enchanting.
Unspam the message handling for orcs going in a battle frenzy, and
allow the message back into normal game.
Fix 1953632: Named monsters' names are shown for unseen invisible
monsters.
Change general monster name handling to refer to friendly monsters as
"your monster" rather than "the monster", like was already the case for
monster speech.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4769 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/message.cc')
| -rw-r--r-- | crawl-ref/source/message.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/crawl-ref/source/message.cc b/crawl-ref/source/message.cc index 222ebe315d..ed19b159ee 100644 --- a/crawl-ref/source/message.cc +++ b/crawl-ref/source/message.cc @@ -295,6 +295,8 @@ int channel_to_colour( msg_channel_type channel, int param ) case MSGCH_MONSTER_SPELL: case MSGCH_MONSTER_ENCHANT: + case MSGCH_FRIEND_SPELL: + case MSGCH_FRIEND_ENCHANT: ret = LIGHTMAGENTA; break; @@ -496,6 +498,7 @@ static void mpr_check_patterns(const std::string& message, if (channel != MSGCH_DIAGNOSTICS && channel != MSGCH_EQUIPMENT && channel != MSGCH_TALK && channel != MSGCH_TALK_VISUAL + && channel != MSGCH_FRIEND_SPELL && channel != MSGCH_FRIEND_ENCHANT && channel != MSGCH_SOUND) { interrupt_activity( AI_MESSAGE, |