stop_travel messages now also apply to shift-run and rest (under the default

conditions this is irrelevant because al messages stop shift-run and rest).

Allow individual interrupts to be disabled for an activity using -=. For
instance, interrupt_rest -= message will disable the
stop-resting-for-any-silly-message behaviour (and also make stop_travel
relevant to resting).

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@761 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 6 insertions, 7 deletions

diff --git a/crawl-ref/source/message.cc b/crawl-ref/source/message.cc
index 8a01c43c26..7f001bce77 100644
--- a/crawl-ref/source/message.cc
+++ b/crawl-ref/source/message.cc
@@ -313,17 +313,16 @@ static void base_mpr(const char *inf, int channel, int param)
     std::string imsg = inf;
     
     for (unsigned i = 0; i < Options.note_messages.size(); ++i) {
-	if (Options.note_messages[i].matches(imsg)) {
-	    take_note(Note(NOTE_MESSAGE, channel, param, inf));
-	    break;
-	}
+        if (Options.note_messages[i].matches(imsg)) {
+            take_note(Note(NOTE_MESSAGE, channel, param, inf));
+            break;
+        }
     }
 
     interrupt_activity( AI_MESSAGE, channel_to_str(channel) + ":" + inf );
 
-    // If you're travelling, only certain user-specified messages can break 
-    // travel
-    if (you.running < 0)
+    // Check messages for all forms of running now.
+    if (you.running)
     {
         std::string message = inf;
         for (unsigned i = 0; i < Options.travel_stop_message.size(); ++i)