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/initfile.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/initfile.cc')
| -rw-r--r-- | crawl-ref/source/initfile.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc index 4a56ce88d3..92b230a6dc 100644 --- a/crawl-ref/source/initfile.cc +++ b/crawl-ref/source/initfile.cc @@ -210,12 +210,12 @@ static int _str_to_channel_colour( const std::string &str ) static const std::string message_channel_names[ NUM_MESSAGE_CHANNELS ] = { - "plain", "prompt", "god", "pray", "duration", "danger", "warning", "food", - "recovery", "sound", "talk", "talk_visual", "intrinsic_gain", "mutation", - "monster_spell", "monster_enchant", "friend_spell", "friend_enchant", - "monster_damage", "monster_target", "rotten_meat", "equipment", "floor", - "multiturn", "examine", "examine_filter", "diagnostic", "error", - "tutorial" + "plain", "friend_action", "prompt", "god", "pray", "duration", "danger", + "warning", "food", "recovery", "sound", "talk", "talk_visual", + "intrinsic_gain", "mutation", "monster_spell", "monster_enchant", + "friend_spell", "friend_enchant", "monster_damage", "monster_target", + "rotten_meat", "equipment", "floor", "multiturn", "examine", + "examine_filter", "diagnostic", "error", "tutorial" }; // returns -1 if unmatched else returns 0--(NUM_MESSAGE_CHANNELS-1) |