diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-12-08 22:46:17 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-12-08 22:46:17 +0000 |
| commit | 847d18dc0c092ff23aa03cfc23b7bc1c32f2dabe (patch) | |
| tree | f5fb2f917eff4b50a42899f1fe6b22198a259e0e /crawl-ref/source/message.cc | |
| parent | 7cc66e61e50963ba90a5db8db19cf75890d3c733 (diff) | |
| download | crawl-ref-847d18dc0c092ff23aa03cfc23b7bc1c32f2dabe.tar.gz crawl-ref-847d18dc0c092ff23aa03cfc23b7bc1c32f2dabe.zip | |
Some more recent trunk commits -> 0.4.
7429, 7672, 7716, 7729, 6646, 7760
* Descriptions, messages, help screen.
Also:
* Don't allow monsters to polymorph into uniques.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@7790 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/message.cc')
| -rw-r--r-- | crawl-ref/source/message.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/crawl-ref/source/message.cc b/crawl-ref/source/message.cc index 7ecf54e064..afc854960a 100644 --- a/crawl-ref/source/message.cc +++ b/crawl-ref/source/message.cc @@ -514,6 +514,14 @@ static void mpr_check_patterns(const std::string& message, { for (unsigned i = 0; i < Options.note_messages.size(); ++i) { + if (channel == MSGCH_EQUIPMENT || channel == MSGCH_FLOOR_ITEMS + || channel == MSGCH_MULTITURN_ACTION + || channel == MSGCH_EXAMINE || channel == MSGCH_EXAMINE_FILTER + || channel == MSGCH_TUTORIAL) + { + continue; + } + if (Options.note_messages[i].matches(message)) { take_note(Note( NOTE_MESSAGE, channel, param, message.c_str() )); |