fiddlerwoaroof/crawl - Change PKV77KJ5ZLBF7O4OQ6HFQRCRQQJULUTXATPWWRXVO4T5G3HMXG7AC

If a pacified monster reaches an exit, make it leave the level even if

that exit isn't its target.

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

Created by dolorous on April 22, 2009

PKV77KJ5ZLBF7O4OQ6HFQRCRQQJULUTXATPWWRXVO4T5G3HMXG7AC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/monstuff.cc at line 3018 [6.1396662]

[4.7516]

[5.2579]

}
static bool _is_level_exit(const coord_def& pos)
{
    // All types of stairs.
    if (is_stair(grd(pos)))
        return (true);
    // Teleportation and shaft traps.
    const trap_type tt = get_trap_type(pos);
    if (tt == TRAP_TELEPORT || tt == TRAP_SHAFT)
        return (true);
    return (false);

Deletion in crawl-ref/source/monstuff.cc at line 3042 [6.1396662]
∅:D[2.2648] → [7.3122:3176]
B:BD[7.3122] → [7.3122:3176]
∅:D[8.2636] → [5.3014:3015]
∅:D[9.2819] → [5.3014:3015]
∅:D[10.2949] → [5.3014:3015]
∅:D[7.3176] → [5.3014:3015]
∅:D[11.24188] → [5.3014:3015]
B:BD[5.3014] → [5.3014:3015]
B:BD[5.3015] → [7.3177:3287]
```
        const dungeon_feature_type gridc = grd(*ri);
        // All types of stairs.
        if (is_stair(gridc))
            e.push_back(level_exit(*ri, false));
```

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

B:BD[5.3420] → [7.3288:3432]

        // Teleportation and shaft traps.
        const trap_type tt = get_trap_type(*ri);
        if (tt == TRAP_TELEPORT || tt == TRAP_SHAFT)

[5.3420]

[7.3432]

        if (_is_level_exit(*ri))

Deletion in crawl-ref/source/monstuff.cc at line 3052 [6.1396662]
∅:D[10.3185] → [12.3282:3283]
∅:D[5.3762] → [12.3282:3283]
B:BD[12.3282] → [12.3282:3283]

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

B:BD[7.10856] → [7.10856:10956]

    // If a pacified monster is leaving the level, and has reached its
    // goal, handle it here.

[7.10856]

[7.10956]

    // If a pacified monster is leaving the level, and has reached an
    // exit (whether that exit was its target or not), handle it here.

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

B:BD[7.11063] → [7.11063:11120]

    if (e_index != -1 && mon->pos() == e[e_index].target

[7.11063]

[3.2646]

    if (_is_level_exit(mon->pos())
        || (e_index != -1 && mon->pos() == e[e_index].target)