fiddlerwoaroof/crawl - Change WL3O4GOFGFEDGJ74LVMYJEIRSSZ3ZPIPY5FWAZJED3FPCTUV6NQQC

Since mons_inside_circle() is only used by Zin's Sanctuary and TSO's

halo, both of which are in spells3.cc, move it there and make it static, at least for now.

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

Created by dolorous on March 21, 2008

WL3O4GOFGFEDGJ74LVMYJEIRSSZ3ZPIPY5FWAZJED3FPCTUV6NQQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spells3.cc at line 744 [4.531613]

B:BD[4.553476] → [4.553476:553548]

                // hate to see the orb get  detroyed by accident {dlb}:

[4.553476]

[4.553548]

                // hate to see the orb get destroyed by accident {dlb}:

Insertion in crawl-ref/source/spells3.cc at line 822 [4.531613]

[5.1713]

// Is there a monster in a circle with the given radius, centered on the
// player's position?  If so, return the distance to it.  Otherwise,
// return -1.
static int mons_inside_circle(int posx, int posy, int radius)
{
    if (!inside_level_bounds(posx, posy))
        return -1;
    int dist = distance(posx, posy, you.x_pos, you.y_pos);
    if (dist > radius*radius)
        return -1;
    if (mgrd[posx][posy] != NON_MONSTER)
        return dist;
    return -1;
}

Replacement in crawl-ref/source/mstuff2.h at line 88 [4.1336995]
B:BD[4.1340152] → [2.4313:4368]
```
void monster_teleport(monsters *monster, bool instan, 
```
[4.1340152]
[6.396756]
```
void monster_teleport(monsters *monster, bool instan,
```
Deletion in crawl-ref/source/misc.h at line 132 [4.1928926]
B:BD[7.2655] → [8.5525:5582]
```
int mons_inside_circle(int posx, int posy, int radius);
```

Deletion in crawl-ref/source/misc.cc at line 2108 [4.1933596]

B:BD[7.2942] → [8.5584:5862]

∅:D[3.5881] → [8.5862:6049]

B:BD[8.5862] → [8.5862:6049]

}
// Is there a monster in a circle with the given radius, centered on the
// player's position?  If so, return the distance to it.  Otherwise,
// return -1.
int mons_inside_circle(int posx, int posy, int radius)
{
    if (!inside_level_bounds(posx, posy))
        return -1;
    int dist = distance(posx, posy, you.x_pos, you.y_pos);
    if (dist > radius*radius)
        return -1;
    if (mgrd[posx][posy] != NON_MONSTER)
        return dist;
    return -1;