fiddlerwoaroof/crawl - Change TFKOHHRA6CJ44OODVA2WL4ITYOLPE6VLKDS7XVBK5JH6BHVZDDFAC

Handle monsters leaving the level via traps in the right place.

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

Created by dolorous on June 20, 2008

TFKOHHRA6CJ44OODVA2WL4ITYOLPE6VLKDS7XVBK5JH6BHVZDDFAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/monstuff.cc at line 3288 [5.1396662]

B:BD[4.2689] → [2.2571:2639]

            if ((mon->x == mon->target_x && mon->y == mon->target_y

[4.2689]

[2.2639]

            if (mon->x == mon->target_x && mon->y == mon->target_y

Deletion in crawl-ref/source/monstuff.cc at line 3292 [5.1396662]

B:BD[2.2828] → [2.2828:2964]

                || distance(mon->x, mon->y, mon->target_x, mon->target_y) == 1
                    && mon->travel_target == MTRAV_TRAP)

Deletion in crawl-ref/source/monstuff.cc at line 3293 [5.1396662]

B:BD[6.2768] → [7.3052:3124]

B:BD[7.3124] → [3.2775:2909]

∅:D[3.2909] → [7.3251:3387]

B:BD[7.3251] → [7.3251:3387]

                if (mon->travel_target == MTRAV_TRAP)
                {
                    _mons_handle_trap_level_exit(mon, mon->target_x,
                                                 mon->target_y);
                }
                else if (mon->travel_target == MTRAV_SUBMERSIBLE)
                    mon->add_ench(ENCH_SUBMERGED);

Insertion in crawl-ref/source/monstuff.cc at line 5997 [5.1396662]

[8.435814]

[9.9645]

            // If the monster is about to step on a trap to leave the
            // level, handle it.
            if (mons_is_leaving(monster)
                && monster->travel_target == MTRAV_TRAP
                && monster->x + mmov_x == monster->target_x
                && monster->y + mmov_y == monster->target_y)
            {
                _mons_handle_trap_level_exit(monster, monster->target_x,
                                             monster->target_y);
                _make_mons_leave_level(monster);
                break;
            }