fiddlerwoaroof/crawl - Change YHDGYR3VS3BCPPD4NLT53AN23R2KYPXBAN5JZJK55673VQ7MP7DAC

* Some more tweaks to the spellcasting interface.

Colour items out of range darkgrey, like we do for floor/monsters.
Fix berserk monsters choosing one of the nearest monsters randomly. (Seriously, I must have been half asleep when I wrote that.)

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

Created by j-p-e-g on May 4, 2009

YHDGYR3VS3BCPPD4NLT53AN23R2KYPXBAN5JZJK55673VQ7MP7DAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/view.cc at line 1465 [5.16817]
B:BD[4.1427] → [4.1427:1472]
```
    unsigned short &ecol = env.show_col(ep);
```
[4.1427]
[4.1472]
```
    unsigned short &ecol  = env.show_col(ep);
```
Insertion in crawl-ref/source/view.cc at line 1494 [5.16817]
[6.178]
[7.567]
```
    const coord_def offset(ENV_SHOW_OFFSET, ENV_SHOW_OFFSET);
```

Replacement in crawl-ref/source/view.cc at line 1499 [5.16817]

B:BD[5.49308] → [6.255:315]

            const coord_def ep = *ri - c + coord_def(9, 9);

[5.49308]

[8.3544]

            const coord_def ep = *ri - c + offset;

Replacement in crawl-ref/source/spl-cast.cc at line 673 [5.293070]

B:BD[3.3370] → [3.3370:3448]

    const int minRange = (check_range ? _get_dist_to_nearest_monster() : -1);

[3.3370]

[5.306605]

    const int minRange = _get_dist_to_nearest_monster();

Replacement in crawl-ref/source/spl-cast.cc at line 733 [5.293070]

B:BD[3.3584] → [3.3584:3637]

    if (_spell_no_hostile_in_range(spell, minRange))

[3.3584]

[3.3637]

    if (check_range && _spell_no_hostile_in_range(spell, minRange))

Replacement in crawl-ref/source/monstuff.cc at line 4411 [5.1396662]

B:BD[9.1274] → [2.2569:2638]

// Choose nearest monster as a foe.  (Used for berserking monsters.)

[9.1274]

[10.5224]

// Choose random nearest monster as a foe.  (Used for berserking monsters.)

Deletion in crawl-ref/source/monstuff.cc at line 4417 [5.1396662]

B:BD[5.1451033] → [11.18603:18913]

∅:D[12.976] → [9.1472:1473]

∅:D[11.18913] → [9.1472:1473]

∅:D[8.46628] → [9.1472:1473]

B:BD[9.1472] → [9.1472:1473]

B:BD[9.1473] → [11.18914:19079]

    std::vector<coord_def> d;
    d.push_back(coord_def(-1,-1));
    d.push_back(coord_def( 0,-1));
    d.push_back(coord_def( 1,-1));
    d.push_back(coord_def(-1, 0));
    d.push_back(coord_def( 1, 0));
    d.push_back(coord_def(-1, 1));
    d.push_back(coord_def( 0, 1));
    d.push_back(coord_def( 1, 1));
    // Search the eight possible directions in random order, with increasing
    // distance from the monster.
    std::random_shuffle(d.begin(), d.end(), random2);

Replacement in crawl-ref/source/monstuff.cc at line 4418 [5.1396662]

B:BD[13.2611] → [11.19080:19282]

∅:D[14.4591] → [12.1198:1222]

∅:D[10.5430] → [12.1198:1222]

∅:D[11.19282] → [12.1198:1222]

B:BD[12.1198] → [12.1198:1222]

B:BD[12.1222] → [11.19283:19293]

        for (unsigned int i = 0; i < d.size(); i++)
        {
            const coord_def p = mon->pos() + coord_def(k*d[i].x, k*d[i].y);
            if (_mons_check_set_foe(mon, p, friendly, neutral))
                return;
        }

[13.2611]

[15.3316]

    {
        int count = 0;
        bool success = false;
        for (int i = -k; i <= k; ++i)
            for (int j = -k; j <= k; (abs(i) == k ? j++ : j += 2*k))
            {
                const coord_def p = mon->pos() + coord_def(i, j);
                if (one_chance_in(++count)
                    && _mons_check_set_foe(mon, p, friendly, neutral))
                {
                    success = true;
                }
            }
        if (success)
            break;
    }

Insertion in crawl-ref/source/directn.h at line 29 [5.3696722]

[16.3523]

    FixedArray<int, ENV_SHOW_DIAMETER, ENV_SHOW_DIAMETER> orig_item_colours;

Insertion in crawl-ref/source/directn.cc at line 884 [5.3697945]
[17.2878]
[18.4140]
```
        orig_item_colours.init(-1);
```

Replacement in crawl-ref/source/directn.cc at line 890 [5.3697945]

B:BD[17.3092] → [19.2947:3027]

                orig_colours(*ri - you.pos() + offset) = env.grid_colours(*ri);

[17.3092]

[17.3202]

                const coord_def showpos = *ri - you.pos() + offset;
                orig_colours(showpos) = env.grid_colours(*ri);

Insertion in crawl-ref/source/directn.cc at line 894 [5.3697945]

[17.3252]


                if (igrd(*ri) != NON_ITEM)
                {
                    orig_item_colours(showpos) = mitm[igrd(*ri)].colour;
                    mitm[igrd(*ri)].colour = DARKGREY;
                }

Replacement in crawl-ref/source/directn.cc at line 939 [5.3697945]

B:BD[17.3418] → [16.4508:4560]

            const int old_colour = orig_colours(c);

[17.3418]

[20.9057]

            const coord_def pos = you.pos() + c - offset;
            int old_colour = orig_colours(c);

Replacement in crawl-ref/source/directn.cc at line 943 [5.3697945]

∅:D[20.9091] → [16.4596:4667]

B:BD[16.4596] → [16.4596:4667]

                env.grid_colours(you.pos() + c - offset) = old_colour;

[20.9091]

[17.3666]

                env.grid_colours(pos) = old_colour;
            old_colour = orig_item_colours(c);
            if (old_colour != -1 && igrd(pos) != NON_ITEM)
                mitm[igrd(pos)].colour = old_colour;