fiddlerwoaroof/crawl - Change REOC4SN5SYUZ6IDLV6I6XZ4MPKE36VAJXLCZ2SXYYZB3RECLXSLQC

When calculating distances for monsters leaving the level, use

grid_distance() instead of distance(), as most other pathfinding-related code seems to do so.

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

Created by dolorous on June 20, 2008

REOC4SN5SYUZ6IDLV6I6XZ4MPKE36VAJXLCZ2SXYYZB3RECLXSLQC

Dependencies

In channels

main

Change contents

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

B:BD[3.4840] → [3.4840:4914]

    if (grid_distance(mon->x, mon->y, patrol_x, patrol_y) > 2*LOS_RADIUS)

[3.4840]

[3.4914]

    if (grid_distance(mon->x, mon->y, patrol_x, patrol_y) > 2 * LOS_RADIUS)

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

B:BD[5.3880] → [2.3311:3430]

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

[5.3880]

[5.3989]

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

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

∅:D[6.3121] → [7.4407:4518]

B:BD[7.4407] → [7.4407:4518]

            if (distance(mon->x, mon->y, you.x_pos, you.y_pos)
                >= LOS_RADIUS * LOS_RADIUS * 4)

[7.4407]

[7.4518]

            if (grid_distance(mon->x, mon->y, you.x_pos, you.y_pos)
                    >= LOS_RADIUS * LOS_RADIUS * 4)

Replacement in crawl-ref/source/monstuff.cc at line 3680 [4.1396662]
B:BD[4.1466764] → [4.1466764:1466807]
```
    if (grid_distance( dx, dy, 0, 0 ) > 3)
```
[4.1466764]
[4.1466807]
```
    if (grid_distance(dx, dy, 0, 0) > 3)
```

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

B:BD[4.1471531] → [4.1471531:1471609]

            && distance( you.x_pos, you.y_pos, monster->x, monster->y ) <= 5)

[4.1471531]

[4.1471609]

            && distance(you.x_pos, you.y_pos, monster->x, monster->y) <= 5)

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

B:BD[4.1471906] → [4.1471906:1471981]

            if (distance( monster->x, monster->y, targ->x, targ->y ) >= 5)

[4.1471906]

[4.1471981]

            if (distance(monster->x, monster->y, targ->x, targ->y) >= 5)

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

B:BD[4.1541221] → [4.1541221:1541291]

B:BD[4.1541291] → [8.9915:9980]

∅:D[8.9980] → [4.1541357:1541424]

B:BD[4.1541357] → [4.1541357:1541424]

        int current_distance = grid_distance( monster->x, monster->y,
                                              monster->target_x,
                                              monster->target_y );

[4.1541221]

[4.1541424]

        int current_distance = grid_distance(monster->x, monster->y,
                                             monster->target_x,
                                             monster->target_y);

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

B:BD[4.1542324] → [4.1542324:1542478]

B:BD[4.1542478] → [8.9981:10045]

∅:D[8.10045] → [4.1542543:1542609]

B:BD[4.1542543] → [4.1542543:1542609]

                    dist[i] = grid_distance( monster->x + compass_x[newdir],
                                             monster->y + compass_y[newdir],
                                             monster->target_x,
                                             monster->target_y );

[4.1542324]

[4.1542609]

                    dist[i] = grid_distance(monster->x + compass_x[newdir],
                                            monster->y + compass_y[newdir],
                                            monster->target_x,
                                            monster->target_y);