fiddlerwoaroof/crawl - Change X4VO6QMQL7BISFKREOENAPNKIIKGFNNKX33DUEI7PRO7U6O2XQYQC

Don't disturb monsters witth their own sound

A monster making noise was causing an ME_DISTURB behaviour_event() for itself, possibly causing it to get a new foe, which could cause strange results if it switched foes during the middle of spell-casting when it made noise from chanting. Now noisy() can accept a "who" parameter, in which case the monster which caused the noise will ignore the noise. This is done in all cases except for when a monster of animal or lower intelligence sets off an alarm trap or does a spell miscast.

Created by Matthew Cline on October 21, 2009

X4VO6QMQL7BISFKREOENAPNKIIKGFNNKX33DUEI7PRO7U6O2XQYQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/view.h at line 75 [6.13254]

B:BD[6.15428] → [7.6:79]

bool noisy(int loudness, const coord_def& where, const char *msg = NULL,

[6.15128]

[7.79]

bool noisy(int loudness, const coord_def& where, int who,

Insertion in crawl-ref/source/view.h at line 77 [6.13254]

[7.113]

[8.203]

bool noisy(int loudness, const coord_def& where, const char *msg = NULL,
           int who = -1, bool mermaid = false);

Replacement in crawl-ref/source/view.cc at line 1290 [6.16817]

B:BD[4.66] → [4.66:131]

    const bool heard       = noisy(noise_level, monster->pos());

[4.66]

[4.131]

    const bool heard       = noisy(noise_level, monster->pos(), monster->mindex());

Replacement in crawl-ref/source/view.cc at line 1729 [6.16817]

B:BD[9.13519] → [7.115:195]

bool noisy(int loudness, const coord_def& where, const char *msg, bool mermaid)

[9.13519]

[6.57809]

bool noisy(int loudness, const coord_def& where, const char *msg, int who,
           bool mermaid)

Insertion in crawl-ref/source/view.cc at line 1771 [6.16817]

[6.58095]

[8.1406]

        // Monsters arent' affected by their own noise.  We don't check
        // where == monster->pos() since it might be caused by the
        // Projected Noise spell.
        if (p == who)
            continue;

Insertion in crawl-ref/source/view.cc at line 1796 [6.16817]

[9.13981]

[2.7]

}
bool noisy(int loudness, const coord_def& where, int who,
           bool mermaid)
{
    return noisy(loudness, where, NULL, who, mermaid);

Replacement in crawl-ref/source/traps.cc at line 418 [11.5308]

B:BD[10.5680] → [10.5680:5820]

            noisy(12, this->pos, (you_trigger ? message_here :
                                  (in_sight ? message_near : message_far)));

[10.5680]

[10.5820]

            const char* msg = (you_trigger ? message_here :
                                 (in_sight ? message_near : message_far));
            // Monsters of normal or greater intelligence will realize that
            // they were the one to set off the trap.
            int source = !m ? you.mindex() :
                         mons_intel(m) >= I_NORMAL ? m->mindex() : -1;
            noisy(12, this->pos, msg, source);

Replacement in crawl-ref/source/spl-mis.cc at line 470 [12.461]

B:BD[5.461] → [5.461:507]

        noisy(sound_loudness, target->pos());

[5.461]

[12.14318]

    {
        // Those monsters of normal or greater intelligence will realize that they
        // were the source of the sound.
        int source = target->atype() == ACT_PLAYER ? you.mindex()
                   : mons_intel(target_as_monster()) >= I_NORMAL ? target->mindex()
                   : -1;
        noisy(sound_loudness, target->pos(), source);
    }

Replacement in crawl-ref/source/mstuff2.cc at line 887 [6.1340842]
B:BD[13.9078] → [13.9078:9116]
```
        noisy(noise, monster->pos());
```
[13.9078]
[13.9116]
```
        noisy(noise, monster->pos(), monster->mindex());
```

Replacement in crawl-ref/source/mstuff2.cc at line 1089 [6.1340842]

B:BD[13.9428] → [3.2775:2829]

    else if (noisy(noise, monster->pos()) || !unseen)

[13.9406]

[3.2829]

    else if (noisy(noise, monster->pos(), monster->mindex()) || !unseen)

Replacement in crawl-ref/source/mstuff2.cc at line 2639 [6.1340842]
B:BD[14.664] → [8.21196:21233]
```
            noisy(15, chief->pos());
```
[14.664]
[15.2245]
```
            noisy(15, chief->pos(), chief->mindex());
```

Replacement in crawl-ref/source/monstuff.cc at line 6309 [6.1396662]

B:BD[16.2775] → [7.3554:3605]

            noisy(12, monster->pos(), NULL, true);

[17.4870]

[7.3605]

            noisy(12, monster->pos(), monster->mindex(), true);

Replacement in crawl-ref/source/monstuff.cc at line 9089 [6.1396662]

B:BD[18.936] → [8.32313:32365]

                noisy(noise_level, monster->pos());

[18.936]

[18.998]

                noisy(noise_level, monster->pos(), monster->mindex());

Replacement in crawl-ref/source/monstuff.cc at line 9096 [6.1396662]

B:BD[19.3479] → [8.32366:32418]

                noisy(noise_level, monster->pos());

[19.3479]

[20.8112]

                noisy(noise_level, monster->pos(), monster->mindex());

Replacement in crawl-ref/source/fight.cc at line 2650 [6.3140790]

B:BD[21.7591] → [21.7591:7631]

            noisy(15, attacker->pos());

[21.7591]

[22.5944]

            noisy(15, attacker->pos(), attacker->mindex());

Replacement in crawl-ref/source/beam.cc at line 5500 [6.4128068]
B:BD[6.4253975] → [23.68662:68692]
```
    noisy(10 + 5 * r, pos());
```
[6.4253975]
[6.4254498]
```
    noisy(10 + 5 * r, pos(), beam_source);
```