fiddlerwoaroof/crawl - Change SRYIUTTRZYQDYPLLXYKEHMYWC4EGBYPOT65M2HZEIGFG6SDMV7SQC

Clean up the circle detection functions.

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

Created by dolorous on March 31, 2008

SRYIUTTRZYQDYPLLXYKEHMYWC4EGBYPOT65M2HZEIGFG6SDMV7SQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spells3.cc at line 667 [6.531613]
B:BD[4.475] → [5.575:591]
```
               
```
[4.475]
[5.591]

Replacement in crawl-ref/source/spells3.cc at line 831 [6.531613]

B:BD[7.1713] → [8.240:382]

// 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,

[7.1713]

[8.382]

// Is (posx, posy) inside a circle with the given radius, centered on
// the player's position?  If so, return the distance to it.  Otherwise,

Replacement in crawl-ref/source/spells3.cc at line 834 [6.531613]

B:BD[8.396] → [2.316:379]

static int _mons_inside_circle(int posx, int posy, int radius)

[8.396]

[8.458]

static int _inside_circle(int posx, int posy, int radius)

Deletion in crawl-ref/source/spells3.cc at line 842 [6.531613]
B:BD[8.630] → [8.630:693]
```
    if (mgrd[posx][posy] != NON_MONSTER)
        return dist;
```
Replacement in crawl-ref/source/spells3.cc at line 843 [6.531613]
B:BD[8.694] → [8.694:709]
```
    return -1;
```
[8.694]
[8.709]
```
    return dist;
```

Replacement in crawl-ref/source/spells3.cc at line 961 [6.531613]

B:BD[9.303] → [2.380:444]

            int dist = _mons_inside_circle(posx, posy, radius);

[9.303]

[9.366]

            int dist = _inside_circle(posx, posy, radius);

Deletion in crawl-ref/source/spells3.cc at line 967 [6.531613]
B:BD[9.512] → [9.512:560]
```
                monsters *mon = &menv[monster];
```

Replacement in crawl-ref/source/spells3.cc at line 968 [6.531613]

B:BD[7.3912] → [9.561:674]

                if (!mons_friendly(mon)
                    && mon->add_ench(mon_enchant(ENCH_FEAR, 0, KC_YOU)))

[7.3912]

[9.674]

                if (monster != NON_MONSTER)

Replacement in crawl-ref/source/spells3.cc at line 970 [6.531613]

B:BD[9.692] → [9.692:782]

                    behaviour_event(mon, ME_SCARE, MHITYOU);
                    count++;

[9.692]

[9.782]

                    monsters *mon = &menv[monster];
                    if (!mons_friendly(mon)
                        && mon->add_ench(mon_enchant(ENCH_FEAR, 0, KC_YOU)))
                    {
                        behaviour_event(mon, ME_SCARE, MHITYOU);
                        count++;
                    }

Replacement in crawl-ref/source/spells3.cc at line 1042 [6.531613]

B:BD[10.987] → [9.2023:2120]

            // affect all monsters inside the halo
            if (mons_inside_halo(posx, posy))

[10.987]

[9.2120]

            if (_inside_circle(posx, posy, radius))

Deletion in crawl-ref/source/spells3.cc at line 1045 [6.531613]
B:BD[9.2178] → [9.2178:2226]
```
                monsters *mon = &menv[monster];
```

Replacement in crawl-ref/source/spells3.cc at line 1046 [6.531613]

B:BD[10.1201] → [9.2227:2279]

B:BD[9.2279] → [3.167:246]

                if (!mon->has_ench(ENCH_BACKLIGHT))
                    mon->add_ench(mon_enchant(ENCH_BACKLIGHT, 0, KC_YOU, 10));

[10.1201]

[9.2330]

                // light up all monsters inside the halo
                if (monster != NON_MONSTER)
                {
                    monsters *mon = &menv[monster];
                    if (!mon->has_ench(ENCH_BACKLIGHT))
                    {
                        mon->add_ench(mon_enchant(ENCH_BACKLIGHT, 0,
                                      KC_YOU, 10));
                    }
                }

Replacement in crawl-ref/source/spells3.cc at line 1064 [6.531613]

B:BD[10.1382] → [2.445:512]

    return (_mons_inside_circle(posx, posy, halo_radius()) != -1);

[10.1382]

[7.5286]

    return (_inside_circle(posx, posy, halo_radius()) != -1
        && mgrd[posx][posy] != NON_MONSTER);