fiddlerwoaroof/crawl - Change 25EX6COTFUVEIGQMCJ47FDSEKASVVO74LPJ4ZS66ZYUYXD5G3N3QC

Improve pathfinding for monsters leaving the level again.

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

Created by dolorous on June 22, 2008

25EX6COTFUVEIGQMCJ47FDSEKASVVO74LPJ4ZS66ZYUYXD5G3N3QC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/monstuff.h at line 41 [6.1390580]
[5.2653]
[5.2653]
```
    bool unreachable;
```

Replacement in crawl-ref/source/monstuff.h at line 45 [6.1390580]

B:BD[5.2710] → [5.2710:2763]

               montravel_target_type m = MTRAV_NONE)

[5.2710]

[5.2763]

               montravel_target_type m = MTRAV_NONE,
               bool u = true)

Replacement in crawl-ref/source/monstuff.h at line 48 [6.1390580]
B:BD[5.2764] → [5.2764:2800]
```
        : target(c), target_type(m)
```
[5.2764]
[5.2800]
```
        : target(c), target_type(m), unreachable(u)
```

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

B:BD[7.5441] → [7.5441:5511]

// restrict_LOS:    restict target to be within PLAYER line of sight.

[7.5441]

[6.1429159]

// restrict_LOS:    restrict target to be within PLAYER line of sight.

Replacement in crawl-ref/source/monstuff.cc at line 1762 [6.1396662]
∅:D[8.11252] → [6.1429753:1429812]
B:BD[6.1429753] → [6.1429753:1429812]
```
}                               // end random_near_space()
```
[8.11252]
[6.1429812]
```
}
```

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

B:BD[9.2582] → [9.2582:2638]

B:BD[9.2638] → [4.2569:2632]

static void _mons_find_level_exits(const monsters *mon,
                                   std::vector<level_exit> &e)

[9.2582]

[9.2751]

static void _mons_find_all_level_exits(const monsters *mon,
                                       std::vector<level_exit> &e)

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

B:BD[4.2897] → [4.2897:2972]

                    e.push_back(level_exit(coord_def(x, y), MTRAV_STAIR));

[4.2897]

[9.3419]

                {
                    e.push_back(level_exit(coord_def(x, y), MTRAV_STAIR,
                                false));
                }

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

B:BD[4.3125] → [4.3125:3199]

                    e.push_back(level_exit(coord_def(x, y), MTRAV_TRAP));

[4.3125]

[4.3199]

                    e.push_back(level_exit(coord_def(x, y), MTRAV_TRAP, false));

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

B:BD[4.3309] → [4.3309:3390]

                    e.push_back(level_exit(coord_def(x, y), MTRAV_SUBMERSIBLE));

[4.3309]

[4.3390]

                {
                    e.push_back(level_exit(coord_def(x, y), MTRAV_SUBMERSIBLE,
                                false));
                }

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

B:BD[9.3554] → [5.3067:3145]

static bool _mons_find_nearest_level_exit(const monsters *mon, level_exit &e)

[9.3554]

[9.3673]

static int _mons_find_nearest_level_exit(const monsters *mon,
                                         std::vector<level_exit> &e)

Deletion in crawl-ref/source/monstuff.cc at line 2403 [6.1396662]
B:BD[9.3715] → [9.3715:3716]
B:BD[9.3716] → [5.3146:3185]
```
    std::vector<level_exit> all_exits;
```

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

B:BD[10.3283] → [5.3186:3253]

    _mons_find_level_exits(mon, all_exits);
    e = level_exit();

[10.3283]

[9.3791]

    if (e.empty())
        _mons_find_all_level_exits(mon, e);

Insertion in crawl-ref/source/monstuff.cc at line 2407 [6.1396662]
[9.3792]
[9.3792]
```
    int retval = -1;
```
Replacement in crawl-ref/source/monstuff.cc at line 2410 [6.1396662]
B:BD[9.3816] → [5.3254:3310]
```
    for (unsigned int i = 0; i < all_exits.size(); ++i)
```
[9.3816]
[9.3874]
```
    for (unsigned int i = 0; i < e.size(); ++i)
```

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

B:BD[9.3880] → [2.2646:2775]

        int dist = grid_distance(mon->x, mon->y, all_exits[i].target.x,
                                 all_exits[i].target.y);

[9.3880]

[9.3989]

        if (e[i].unreachable)
            continue;
        int dist = grid_distance(mon->x, mon->y, e[i].target.x,
                                 e[i].target.y);

Deletion in crawl-ref/source/monstuff.cc at line 2420 [6.1396662]

B:BD[9.4048] → [9.4048:4123]

            if (old_dist == dist && coinflip())
                continue;

Replacement in crawl-ref/source/monstuff.cc at line 2422 [6.1396662]
B:BD[9.4153] → [5.3431:3461]
```
            e = all_exits[i];
```
[9.4153]
[9.4225]
```
            retval = i;
```
Replacement in crawl-ref/source/monstuff.cc at line 2426 [6.1396662]
B:BD[9.4242] → [9.4242:4271]
```
    return (old_dist != -1);
```
[9.4242]
[9.4271]
```
    return (retval);
```
Replacement in crawl-ref/source/monstuff.cc at line 2525 [6.1396662]
B:BD[11.5221] → [3.2569:2594]
∅:D[3.2594] → [6.1440559:1440560]
∅:D[12.2770] → [6.1440559:1440560]
∅:D[13.2835] → [6.1440559:1440560]
∅:D[11.5221] → [6.1440559:1440560]
∅:D[14.420813] → [6.1440559:1440560]
B:BD[6.1440559] → [6.1440559:1440560]
```
    static level_exit e;
```
[11.5221]
[15.3930]
```
    static std::vector<level_exit> e;
    static int                     e_index;
```

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

∅:D[5.3492] → [9.4543:4602]

B:BD[9.4543] → [9.4543:4602]

                if (_mons_find_nearest_level_exit(mon, e))

[9.4514]

[9.4602]

                e_index = _mons_find_nearest_level_exit(mon, e);
                if (!e[e_index].unreachable)

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

B:BD[9.4660] → [5.3493:3645]

                    mon->target_x = e.target.x;
                    mon->target_y = e.target.y;
                    mon->travel_target = e.target_type;

[9.4660]

[12.3025]

                    mon->target_x = e[e_index].target.x;
                    mon->target_y = e[e_index].target.y;
                    mon->travel_target = e[e_index].target_type;
                    if (travelling)
                        mon->travel_path.clear();

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

B:BD[12.3226] → [12.3226:3298]

                                               e.target.x, e.target.y);

[12.3226]

[12.3298]

                                               e[e_index].target.x,
                                               e[e_index].target.y);

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

B:BD[12.4756] → [12.4756:4813]

                         e.target.x, e.target.y, range);

[12.4756]

[12.4813]

                         e[e_index].target.x, e[e_index].target.y, range);

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

B:BD[12.4942] → [12.4942:5000]

                    if (mp.start_pathfind(mon, e.target))

[12.4942]

[12.5000]

                    if (mp.start_pathfind(mon, e[e_index].target))

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

[9.4813]

[12.6504]

            }
            // If the level exit is unreachable, find a new one.
            if (mon->travel_target == MTRAV_UNREACHABLE)
            {
                e[e_index].unreachable = true;
                mon->travel_target = MTRAV_NONE;

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

B:BD[16.2680] → [12.6520:6589]

                    && mon->x == e.target.x && mon->y == e.target.y)

[16.2680]

[17.2754]

                    && mon->x == e[e_index].target.x
                    && mon->y == e[e_index].target.y)