fiddlerwoaroof/crawl - Change 2E4RV454MTTCKYLKMSHEEAFPNAFVUXXPBZV3XP6V7QMF4BBWE7TAC

Added bounds check for berserk monsters looking for a target.

Dropped berserk duration again.

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

Created by dshaligram on August 7, 2007

2E4RV454MTTCKYLKMSHEEAFPNAFVUXXPBZV3XP6V7QMF4BBWE7TAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spells2.cc at line 1485 [3.569242]
B:BD[2.1269] → [2.1269:1300]
```
        berserk.duration *= 2;
```
[2.1269]
[2.1300]
```
        berserk.duration = berserk.duration * 3 / 2;
```

Insertion in crawl-ref/source/monstuff.cc at line 1899 [3.1396662]

[3.1451032]

[4.1273]


static bool mons_check_set_foe(monsters *mon, int x, int y,
                               bool friendly)
{
    if (!in_bounds(x, y))
        return (false);
    
    if (!friendly && x == you.x_pos && y == you.y_pos
        && mons_player_visible(mon))
    {
        mon->foe = MHITYOU;
        return (true);
    }
    if (mgrd[x][y] != NON_MONSTER)
    {
        monsters *foe = &menv[mgrd[x][y]];
        if (foe != mon
            && mons_monster_visible(mon, foe)
            && mons_friendly(foe) != friendly)
        {
            mon->foe = mgrd[x][y];
            return (true);
        }
    }
    return (false);
}

Replacement in crawl-ref/source/monstuff.cc at line 1932 [3.1396662]
B:BD[4.1389] → [4.1389:1429]
```
    bool friendly = mons_friendly(mon);
```
[4.1389]
[3.1451032]
```
    const bool friendly = mons_friendly(mon);
```
Replacement in crawl-ref/source/monstuff.cc at line 1934 [3.1396662]
B:BD[3.1451033] → [4.1430:1472]
```
    int mx = mon->x;
    int my = mon->y;
```
[3.1451033]
[4.1472]
```
    const int mx = mon->x;
    const int my = mon->y;
```

Replacement in crawl-ref/source/monstuff.cc at line 1937 [3.1396662]

B:BD[4.1473] → [4.1473:1919]

    for (int k = 1; k <= 8; k++)
       for (int x = mx - k; x <= mx + k; x++)
          for (int y = my - k; y <= my + k; y++)
   {
             if (x != mx-k && x != mx+k && y != my-k && y != my+k)
                 continue;
                 
             if (!friendly && x == you.x_pos && y == you.y_pos
                 && mons_player_visible(mon))
             {
                 mon->foe = MHITYOU;
                 return;
             }

[4.1473]

[4.1919]

    for (int k = 1; k <= LOS_RADIUS; k++)
    {
        for (int x = mx - k; x <= mx + k; ++x)
            if (mons_check_set_foe(mon, x, my - k, friendly)
                || mons_check_set_foe(mon, x, my + k, friendly))
                return;

Replacement in crawl-ref/source/monstuff.cc at line 1944 [3.1396662]

B:BD[4.1920] → [4.1920:2313]

             if (mgrd[x][y] != NON_MONSTER
                 && !(x == mx && y == my))
             {
                 monsters *foe = &menv[mgrd[x][y]];
                 if (mons_monster_visible(mon, foe)
                     && mons_friendly(foe) != friendly)
                 {
                     mon->foe = mgrd[x][y];
                     return;
                 }
             }
   }

[4.1920]

[4.2313]

        for (int y = my - k + 1; y < my + k; ++y)
            if (mons_check_set_foe(mon, mx - k, y, friendly)
                || mons_check_set_foe(mon, mx + k, y, friendly))
                return;    
    }