fiddlerwoaroof/crawl - Change VNB7OLRPCC7ITTUKYLQ4SDV25QD2XZHXOYXDCIRJ2OTF2U4VZFWAC

Smooth out the routines to find all the level exits.

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

Created by dolorous on June 20, 2008

VNB7OLRPCC7ITTUKYLQ4SDV25QD2XZHXOYXDCIRJ2OTF2U4VZFWAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/monstuff.h at line 35 [4.1390580]

[3.63240]

};
struct level_exit
{
    coord_def target;
    montravel_target_type target_type;
public:
    level_exit(coord_def c = coord_def(-1, -1),
               montravel_target_type m = MTRAV_NONE)
        : target(c), target_type(m)
    {
    }

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

B:BD[5.2638] → [5.2638:2751]

                                   std::vector<coord_def> &e,
                                   int range = -1)

[5.2638]

[5.2751]

                                   std::vector<level_exit> &e, int range = -1)

Replacement in crawl-ref/source/monstuff.cc at line 2375 [4.1396662]
B:BD[5.2984] → [5.2984:3014]
```
            e.push_back(*ri);
```
[5.2984]
[5.3014]
```
            e.push_back(level_exit(*ri, MTRAV_STAIR));
```
Replacement in crawl-ref/source/monstuff.cc at line 2382 [4.1396662]
B:BD[5.3388] → [5.3388:3418]
```
            e.push_back(*ri);
```
[5.3388]
[6.4584]
```
            e.push_back(level_exit(*ri, MTRAV_TRAP));
```

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

B:BD[5.3516] → [5.3516:3546]

            e.push_back(*ri);

[5.3516]

[5.3546]

            e.push_back(level_exit(*ri, MTRAV_SUBMERSIBLE));

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

B:BD[5.3554] → [5.3554:3673]

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

[5.3554]

[5.3673]

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

Deletion in crawl-ref/source/monstuff.cc at line 2393 [4.1396662]
B:BD[5.3675] → [5.3675:3715]
```
    std::vector<coord_def> level_exits;
```
Replacement in crawl-ref/source/monstuff.cc at line 2394 [4.1396662]
B:BD[5.3716] → [5.3716:3762]
```
    _mons_find_level_exits(mon, level_exits);
```
[5.3716]
[7.3282]
```
    std::vector<level_exit> all_exits;
```
Replacement in crawl-ref/source/monstuff.cc at line 2396 [4.1396662]
B:BD[7.3283] → [5.3763:3791]
```
    e.x = -1;
    e.y = -1;
```
[7.3283]
[5.3791]
```
    _mons_find_level_exits(mon, all_exits);
    e = level_exit();
```

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

B:BD[5.3816] → [5.3816:3874]

    for (unsigned int i = 0; i < level_exits.size(); ++i)

[5.3816]

[5.3874]

    for (unsigned int i = 0; i < all_exits.size(); ++i)

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

B:BD[5.3880] → [5.3880:3989]

        int dist = distance(mon->x, mon->y, level_exits[i].x,
                            level_exits[i].y);

[5.3880]

[5.3989]

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

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

B:BD[5.4153] → [5.4153:4225]

            e.x = level_exits[i].x;
            e.y = level_exits[i].y;

[5.4153]

[5.4225]

            e = all_exits[i];

Replacement in crawl-ref/source/monstuff.cc at line 3261 [4.1396662]
B:BD[5.4514] → [5.4514:4543]
```
                coord_def e;
```
[5.4514]
[5.4543]
```
                level_exit e;
```

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

B:BD[5.4660] → [5.4660:4742]

B:BD[5.4742] → [8.3285:3454]

                    mon->target_x = e.x;
                    mon->target_y = e.y;
                    mon->travel_target =
                        (trap_at_xy(mon->target_x, mon->target_y) != -1) ?
                            MTRAV_TRAP : MTRAV_EXIT;

[5.4660]

[5.4795]

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

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

B:BD[5.4827] → [2.2569:2683]

            // If it's on an exit, make it leave the level.
            else if (mon->travel_target == MTRAV_EXIT

[5.4827]

[2.2683]

            // If it's on a stair, make it leave the level.
            else if (mon->travel_target == MTRAV_STAIR

Replacement in crawl-ref/source/enum.h at line 2793 [4.3287960]

B:BD[5.5480] → [8.4090:4206]

    MTRAV_EXIT,         // Travelling to reach a level exit.
    MTRAV_TRAP          // Travelling to reach a trap.

[5.5480]

[4.3376769]

    MTRAV_STAIR,        // Travelling to reach a stair.
    MTRAV_TRAP,         // Travelling to reach a trap.
    MTRAV_SUBMERSIBLE   // Travelling to reach a submersible place.