diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-05-27 15:22:09 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-05-27 15:22:09 +0000 |
| commit | 70ce5c5c0ce725bdb808bc5d5e7b216a7707e911 (patch) | |
| tree | baa3b8b30850dc1133af3c0d50772cb618fd98d3 /crawl-ref/source/message.cc | |
| parent | 48897bf56eb09968aa14e171ac323d40719428d3 (diff) | |
| download | crawl-ref-70ce5c5c0ce725bdb808bc5d5e7b216a7707e911.tar.gz crawl-ref-70ce5c5c0ce725bdb808bc5d5e7b216a7707e911.zip | |
Add yet another new channel MSGCH_FRIEND_ACTION that
simple_monster_message uses instead of MSGCH_PLAIN if the monster in question
is friendly, and such messages (e.g. "Your imp blinks", but also all
other similar messages) won't interrupt resting nor running.
Also clean up travel.cc a bit, esp. the traversable_grid check that now
simply uses a for loop rather than list all traversable grids.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5297 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, 2 insertions, 1 deletions
diff --git a/crawl-ref/source/message.cc b/crawl-ref/source/message.cc index cfaf13ec16..998a402315 100644 --- a/crawl-ref/source/message.cc +++ b/crawl-ref/source/message.cc @@ -318,6 +318,7 @@ int channel_to_colour( msg_channel_type channel, int param ) break; case MSGCH_PLAIN: + case MSGCH_FRIEND_ACTION: case MSGCH_ROTTEN_MEAT: case MSGCH_EQUIPMENT: case MSGCH_EXAMINE: @@ -503,7 +504,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) + && channel != MSGCH_FRIEND_ACTION && channel != MSGCH_SOUND) { interrupt_activity( AI_MESSAGE, channel_to_str(channel) + ":" + message ); |