fiddlerwoaroof/crawl - Change SCXDRLT2W436HM4WX4UZRC5M3XNSA65V7XR7AGHEOTSKBWEHUREAC

Faking falls through shaft traps for pacified monsters doesn't quite

work, as it doesn't use the proper target. Fix this by not marking pacified monsters for transit if they fall through shaft traps.

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

Created by dolorous on June 28, 2008

SCXDRLT2W436HM4WX4UZRC5M3XNSA65V7XR7AGHEOTSKBWEHUREAC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/monstuff.cc at line 2447 [4.1396662]
B:BD[3.3887] → [3.3887:3957]
∅:D[3.3957] → [5.2770:2776]
B:BD[5.2770] → [5.2770:2776]
B:BD[5.2776] → [3.3958:4080]
∅:D[3.4080] → [5.3298:3304]
B:BD[5.3298] → [5.3298:3304]
```
    // Shaft traps.
    else if (trap_type_at_xy(x, y) == TRAP_SHAFT)
    {
        simple_monster_message(mon, " falls through a shaft!");
        grd[x][y] = trap_category(trap_type_at_xy(x, y));
    }
```

Replacement in crawl-ref/source/monstuff.cc at line 3049 [4.1396662]

B:BD[2.2593] → [2.2593:2768]

                // If a pacified monster is leaving the level via
                // something other than a trap, and has reached its
                // goal, handle it here.

[2.2593]

[2.2768]

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

Replacement in crawl-ref/source/mon-util.cc at line 6249 [4.1699344]

B:BD[6.15928] → [6.15928:15950]

    set_transit(lev);

[6.15928]

[7.7769]

    // If a pacified monster is leaving the level via a shaft trap, and
    // has reached its goal, handle it here.
    if (!mons_is_pacified(this))
        set_transit(lev);