fiddlerwoaroof/crawl - Change KU6YUIJWXZSNTABFB36HDEEZ6LTY7O4VKI3RNFBQE3LEYZCT3XQQC

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

Created by dshaligram on January 1, 2007

KU6YUIJWXZSNTABFB36HDEEZ6LTY7O4VKI3RNFBQE3LEYZCT3XQQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/message.cc at line 316 [4.1993826]

B:BD[3.557801] → [3.557801:557920]

	if (Options.note_messages[i].matches(imsg)) {
	    take_note(Note(NOTE_MESSAGE, channel, param, inf));
	    break;
	}

[3.557801]

[3.557920]

        if (Options.note_messages[i].matches(imsg)) {
            take_note(Note(NOTE_MESSAGE, channel, param, inf));
            break;
        }

Replacement in crawl-ref/source/message.cc at line 324 [4.1993826]

B:BD[4.1999199] → [5.254115:254231]

    // If you're travelling, only certain user-specified messages can break 
    // travel
    if (you.running < 0)

[4.1999199]

[5.254231]

    // Check messages for all forms of running now.
    if (you.running)

Replacement in crawl-ref/source/initfile.cc at line 496 [4.2957258]

B:BD[3.790395] → [3.790395:790461]

                                          bool append_interrupts)

[3.790395]

[3.790461]

                                          bool append_interrupts,
                                          bool remove_interrupts)

Insertion in crawl-ref/source/initfile.cc at line 506 [4.2957258]
[3.790647]
[3.790647]
```
    std::vector<std::string> interrupts = split_string(",", interrupt_names);
```

Replacement in crawl-ref/source/initfile.cc at line 509 [4.2957258]

B:BD[3.790726] → [3.790726:790796]

    if (!append_interrupts)
        clear_activity_interrupts(eints);

[3.790726]

[3.790796]

    if (remove_interrupts)
    {
        FixedVector<bool, NUM_AINTERRUPTS> refints;
        clear_activity_interrupts(refints);
        for (int i = 0, size = interrupts.size(); i < size; ++i)
            set_activity_interrupt(refints, interrupts[i]);

Replacement in crawl-ref/source/initfile.cc at line 516 [4.2957258]

B:BD[3.790797] → [3.790797:790990]

    std::vector<std::string> interrupts = split_string(",", interrupt_names);
    for (int i = 0, size = interrupts.size(); i < size; ++i)
        set_activity_interrupt(eints, interrupts[i]);

[3.790797]

[3.790990]

        for (int i = 0; i < NUM_AINTERRUPTS; ++i)
            if (refints[i])
                eints[i] = false;
    }
    else
    {
        if (!append_interrupts)
            clear_activity_interrupts(eints);
        
        for (int i = 0, size = interrupts.size(); i < size; ++i)
            set_activity_interrupt(eints, interrupts[i]);
    }

Replacement in crawl-ref/source/initfile.cc at line 1502 [4.2957258]

B:BD[3.801508] → [3.801508:801552]

                               plus_equal);

[3.801508]

[3.801552]

                               plus_equal,
                               minus_equal);

Replacement in crawl-ref/source/externs.h at line 1009 [4.3270163]

B:BD[3.901688] → [3.901688:901745]

                                bool append_interrupts);

[3.901688]

[2.10807]

                                bool append_interrupts,
                                bool remove_interrupts);