fiddlerwoaroof/crawl - Change LFBNFE3PZBXTR2ROPKYPARUWLJAYWAKGTS7VBWADZWVVSJ5CLX6AC

Pull code from mon->can_see(target) into a new function mon->see_grid()

and use it in the checks for monster/monster visibility.

I didn't have the time to test it but it should at least solve part of the problem of monsters firing through walls (if monster visibility is even checked there, which I don't know).

Also (as usually), more code cleanup.

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

Created by j-p-e-g on May 18, 2008

LFBNFE3PZBXTR2ROPKYPARUWLJAYWAKGTS7VBWADZWVVSJ5CLX6AC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/view.cc at line 2975 [11.16817]

B:BD[10.5851] → [10.5851:5990]

                    if (ch && (bc == get_sightmap_char(DNGN_FLOOR) ||
                               bc == get_magicmap_char(DNGN_FLOOR)))

[10.5851]

[10.5990]

                    if (ch && (bc == get_sightmap_char(DNGN_FLOOR)
                               || bc == get_magicmap_char(DNGN_FLOOR)))
                    {

Insertion in crawl-ref/source/view.cc at line 2979 [11.16817]
[10.6023]
[10.6023]
```
                    }
```
Replacement in crawl-ref/source/spells4.cc at line 592 [11.436250]
B:BD[12.5537] → [12.5537:5574]
```
            mgen_data( MONS_DRAGON, 
```
[12.5537]
[12.5574]
```
            mgen_data( MONS_DRAGON,
```
Replacement in crawl-ref/source/spells4.cc at line 1977 [11.436250]
B:BD[11.501854] → [11.501854:501884]
```
    blast.thrower = KILL_YOU;
```
[11.501854]
[13.144231]
```
    blast.thrower     = KILL_YOU;
```

Replacement in crawl-ref/source/spells4.cc at line 1979 [11.436250]

∅:D[13.144261] → [11.501913:502004]

B:BD[11.501913] → [11.501913:502004]

    blast.ex_size = 1;              // default
    blast.type = '#';
    blast.colour = 0;

[13.144261]

[13.144262]

    blast.ex_size     = 1;              // default
    blast.type        = '#';
    blast.colour      = 0;

Replacement in crawl-ref/source/spells4.cc at line 1983 [11.436250]

B:BD[13.144290] → [14.216:280]

∅:D[14.280] → [13.144290:144319]

B:BD[13.144290] → [13.144290:144319]

∅:D[13.144319] → [11.502092:502123]

B:BD[11.502092] → [11.502092:502123]

B:BD[11.502123] → [15.574:605]

    blast.source_x = you.x_pos;
    blast.source_y = you.y_pos;
    blast.is_tracer = false;
    blast.flavour = BEAM_FRAG;
    blast.hit = AUTOMATIC_HIT;

[13.144290]

[11.502123]

    blast.source_x    = you.x_pos;
    blast.source_y    = you.y_pos;
    blast.is_tracer   = false;
    blast.flavour     = BEAM_FRAG;
    blast.hit         = AUTOMATIC_HIT;

Replacement in crawl-ref/source/spells4.cc at line 2012 [11.436250]

B:BD[11.502960] → [11.502960:502988]

B:BD[11.502988] → [13.144320:144358]

∅:D[13.144358] → [11.503038:503072]

B:BD[11.503038] → [11.503038:503072]

            explode = true;
            blast.name = "icy blast";
            blast.colour = WHITE;

[11.502960]

[11.503072]

            explode          = true;
            blast.name       = "icy blast";
            blast.colour     = WHITE;

Replacement in crawl-ref/source/spells4.cc at line 2016 [11.436250]
B:BD[11.503106] → [11.503106:503144]
```
            blast.flavour = BEAM_ICE;
```
[11.503106]
[11.503144]
```
            blast.flavour    = BEAM_ICE;
```

Replacement in crawl-ref/source/spells4.cc at line 2061 [11.436250]

B:BD[11.504684] → [11.504684:504712]

B:BD[11.504712] → [13.144409:144462]

∅:D[13.144462] → [11.504779:504812]

B:BD[11.504779] → [11.504779:504812]

            explode = true;
            blast.name = "blast of metal fragments";
            blast.colour = CYAN;

[11.504684]

[11.504812]

            explode          = true;
            blast.name       = "blast of metal fragments";
            blast.colour     = CYAN;

Replacement in crawl-ref/source/spells4.cc at line 2073 [11.436250]

B:BD[11.505138] → [11.505138:505197]

B:BD[11.505197] → [13.144463:144515]

∅:D[13.144515] → [11.505261:505295]

B:BD[11.505261] → [11.505261:505295]

            explode = true;
            blast.ex_size = 2;
            blast.name = "blast of rock fragments";
            blast.colour = BROWN;

[11.505138]

[11.505295]

            explode          = true;
            blast.ex_size    = 2;
            blast.name       = "blast of rock fragments";
            blast.colour     = BROWN;

Replacement in crawl-ref/source/spells4.cc at line 2084 [11.436250]
B:BD[13.144582] → [13.144582:144610]
```
            explode = true;
```
[13.144582]
[13.144610]
```
            explode       = true;
```

Replacement in crawl-ref/source/spells4.cc at line 2110 [11.436250]

B:BD[11.505490] → [11.505490:505549]

B:BD[11.505549] → [13.145194:145246]

∅:D[13.145246] → [11.505613:505647]

B:BD[11.505613] → [11.505613:505647]

            explode = true;
            blast.ex_size = 2;
            blast.name = "blast of crystal shards";
            blast.colour = WHITE;

[11.505490]

[11.505647]

            explode          = true;
            blast.ex_size    = 2;
            blast.name       = "blast of crystal shards";
            blast.colour     = WHITE;

Replacement in crawl-ref/source/spells4.cc at line 2163 [11.436250]
B:BD[11.506917] → [13.145247:145295]
```
        blast.name = "blast of rock fragments";
```
[11.506917]
[11.506977]
```
        blast.name       = "blast of rock fragments";
```

Replacement in crawl-ref/source/spells4.cc at line 2171 [11.436250]

B:BD[11.507191] → [11.507191:507268]

B:BD[11.507268] → [16.4337:4627]

                || (pow >= 40 && grid == DNGN_ROCK_WALL && one_chance_in(3))
                || (pow >= 40 && grid == DNGN_CLEAR_ROCK_WALL
                    && one_chance_in(3))
                || (pow >= 60 && grid == DNGN_STONE_WALL && one_chance_in(10))
                || (pow >= 60 && grid == DNGN_CLEAR_STONE_WALL &&
                    one_chance_in(10)) ))

[11.507191]

[11.507349]

                || pow >= 40 && grid == DNGN_ROCK_WALL && one_chance_in(3)
                || pow >= 40 && grid == DNGN_CLEAR_ROCK_WALL
                   && one_chance_in(3)
                || pow >= 60 && grid == DNGN_STONE_WALL && one_chance_in(10)
                || pow >= 60 && grid == DNGN_CLEAR_STONE_WALL
                   && one_chance_in(10)))

Replacement in crawl-ref/source/spells4.cc at line 2179 [11.436250]
B:BD[11.507401] → [11.507401:507432]
```
            blast.ex_size = 2;
```
[11.507401]
[11.507432]
```
            blast.ex_size         = 2;
```
Replacement in crawl-ref/source/spells4.cc at line 2181 [11.436250]
B:BD[11.507480] → [11.507480:507514]
```
            debris = DEBRIS_ROCK;
```
[11.507480]
[11.507514]
```
            debris                = DEBRIS_ROCK;
```

Replacement in crawl-ref/source/spells4.cc at line 2190 [11.436250]

∅:D[17.2347] → [11.507630:507688]

B:BD[11.507630] → [11.507630:507688]

B:BD[11.507854] → [11.507854:507878]

B:BD[11.507878] → [13.145296:145345]

        what = "metal wall";
        blast.colour = CYAN;
        explode = true;
        blast.name = "blast of metal fragments";

[17.2347]

[11.507941]

        what             = "metal wall";
        blast.colour     = CYAN;
        explode          = true;
        blast.name       = "blast of metal fragments";

Replacement in crawl-ref/source/spells4.cc at line 2209 [11.436250]

B:BD[11.508301] → [11.508301:508362]

B:BD[11.508565] → [11.508565:508616]

B:BD[11.508616] → [13.145346:145394]

        what = "crystal wall";
        blast.colour = GREEN;
        explode = true;
        blast.ex_size = 2;
        blast.name = "blast of crystal shards";

[11.508301]

[11.508676]

        what             = "crystal wall";
        blast.colour     = GREEN;
        explode          = true;
        blast.ex_size    = 2;
        blast.name       = "blast of crystal shards";

Replacement in crawl-ref/source/spells4.cc at line 2216 [11.436250]

B:BD[11.508707] → [11.508707:508732]

B:BD[11.508732] → [18.2368:2430]

        if (okay_to_dest
            && grid == DNGN_GREEN_CRYSTAL_WALL && coinflip())

[11.508707]

[11.508909]

        if (okay_to_dest && grid == DNGN_GREEN_CRYSTAL_WALL && coinflip())

Replacement in crawl-ref/source/spells4.cc at line 2241 [11.436250]

B:BD[11.509576] → [11.509576:509669]

B:BD[11.509669] → [13.145395:145438]

∅:D[13.145438] → [11.509726:509792]

B:BD[11.509726] → [11.509726:509792]

        explode = true;
        hole = false;           // to hit monsters standing on traps
        blast.name = "blast of fragments";
        blast.colour = env.floor_colour;  // in order to blend in

[11.509576]

[11.509792]

        explode          = true;
        hole             = false;    // to hit monsters standing on traps
        blast.name       = "blast of fragments";
        blast.colour     = env.floor_colour;  // in order to blend in

Replacement in crawl-ref/source/spells4.cc at line 2267 [11.436250]

B:BD[11.510390] → [11.510390:510483]

B:BD[11.510483] → [13.145439:145487]

∅:D[13.145487] → [11.510545:510579]

B:BD[11.510545] → [11.510545:510579]

        explode = true;
        hole = false;           // to hit monsters standing on doors
        blast.name = "blast of rock fragments";
        blast.colour = LIGHTGREY;

[11.510390]

[11.510579]

        explode          = true;
        hole             = false;  // to hit monsters standing on doors
        blast.name       = "blast of rock fragments";
        blast.colour     = LIGHTGREY;

Replacement in crawl-ref/source/spells4.cc at line 2319 [11.436250]
B:BD[11.511961] → [19.9557:9608]
```
    if ( !spell_direction(targ, tmp, DIR_TARGET) )
```
[11.511961]
[11.512015]
```
    if (!spell_direction(targ, tmp, DIR_TARGET))
```
Replacement in crawl-ref/source/spells4.cc at line 2352 [11.436250]
B:BD[20.660] → [20.660:680]
```
    if ( pow > 50 )
```
[20.660]
[20.680]
```
    if (pow > 50)
```

Replacement in crawl-ref/source/spells4.cc at line 2355 [11.436250]

B:BD[20.699] → [20.699:754]

    if ( grid_is_solid(beam.target_x, beam.target_y) )

[20.699]

[20.754]

    if (grid_is_solid(beam.target_x, beam.target_y))

Replacement in crawl-ref/source/spells4.cc at line 2370 [11.436250]
B:BD[21.581] → [21.581:605]
```
    if ( item == NULL )
```
[21.581]
[20.904]
```
    if (item == NULL)
```
Replacement in crawl-ref/source/spells4.cc at line 2375 [11.436250]
B:BD[21.634] → [21.634:660]
```
    else if ( idx == -1 )
```
[21.634]
[21.660]
```
    else if (idx == -1)
```
Insertion in crawl-ref/source/spells4.cc at line 2380 [11.436250]
[20.976]
[20.976]
```
    throw_it(beam, idx, true, random2(pow/4));
```
Deletion in crawl-ref/source/spells4.cc at line 2383 [11.436250]
B:BD[20.977] → [20.977:1026]
```
    throw_it( beam, idx, true, random2(pow/4) );
```
Replacement in crawl-ref/source/spells4.cc at line 2408 [11.436250]
B:BD[11.513888] → [19.9609:9660]
```
    if ( !spell_direction(targ, tmp, DIR_TARGET) )
```
[11.513888]
[11.513942]
```
    if (!spell_direction(targ, tmp, DIR_TARGET))
```

Replacement in crawl-ref/source/player.cc at line 4934 [11.962854]

B:BD[11.1063989] → [11.1063989:1064045]

B:BD[11.1064045] → [22.13534:13604]

        // XXX: which message channel for this message?
        mprf("You are %spoisoned.", (old_value > 0) ? "more " : "" );

[11.1063878]

[23.5551]

        mprf(MSGCH_WARN, "You are %spoisoned.",
             (old_value > 0) ? "more " : "" );

Deletion in crawl-ref/source/player.cc at line 4978 [11.962854]
B:BD[11.1064873] → [11.1064873:1064929]
```
        // XXX: which message channel for this message?
```

Replacement in crawl-ref/source/player.cc at line 4979 [11.962854]

∅:D[24.617] → [22.13605:13675]

B:BD[11.1064929] → [22.13605:13675]

        mprf("You are %sconfused.", (old_value > 0) ? "more " : "" );

[24.617]

[25.72764]

        mprf(MSGCH_WARN, "You are %sconfused.",
             (old_value > 0) ? "more " : "" );

Replacement in crawl-ref/source/player.cc at line 5953 [11.962854]

B:BD[26.6952] → [26.6952:6985]

B:BD[26.6985] → [27.3457:3554]

    if (mutation[MUT_BERSERK] &&
         (random2(100) < (mutation[MUT_BERSERK] * 10) - 5)
        || _equipment_make_berserk())

[26.6952]

[26.7044]

    if (mutation[MUT_BERSERK]
        && (random2(100) < (mutation[MUT_BERSERK] * 10) - 5)
            || _equipment_make_berserk())

Insertion in crawl-ref/source/player.cc at line 5985 [11.962854]
[28.798]
[28.798]

Replacement in crawl-ref/source/player.cc at line 5990 [11.962854]

B:BD[28.885] → [29.2615:2712]

    if (you.is_undead &&
        (you.species != SP_VAMPIRE || you.hunger_state <= HS_SATIATED))

[28.885]

[28.908]

    if (you.is_undead
        && (you.is_undead != US_SEMI_UNDEAD || you.hunger_state <= HS_SATIATED))

Insertion in crawl-ref/source/player.cc at line 5995 [11.962854]
[28.1008]
[28.1008]
Deletion in crawl-ref/source/mstuff2.cc at line 53 [11.1340842]
B:BD[11.1341986] → [11.1341986:1342078]
```
// XXX: must fix species abils to not use duration 15
// -- ummm ... who wrote this? {dlb}
```

Replacement in crawl-ref/source/monstuff.cc at line 763 [11.1396662]

B:BD[30.158] → [31.3132:3172]

∅:D[31.3172] → [30.201:232]

B:BD[30.201] → [30.201:232]

B:BD[30.232] → [31.3173:3282]

        if ( MONST_INTERESTING(monster)
             // XXX yucky hack
             || monster->type == MONS_PLAYER_GHOST
             || monster->type == MONS_PANDEMONIUM_DEMON )

[30.158]

[30.338]

        if (MONST_INTERESTING(monster)
            // XXX yucky hack
            || monster->type == MONS_PLAYER_GHOST
            || monster->type == MONS_PANDEMONIUM_DEMON)

Replacement in crawl-ref/source/monstuff.cc at line 778 [11.1396662]

B:BD[11.1405983] → [11.1405983:1406054]

            && (!player_under_penance() && you.piety > random2(1000)))

[11.1405983]

[11.1406054]

            && !player_under_penance() && you.piety > random2(1000))

Replacement in crawl-ref/source/monstuff.cc at line 872 [11.1396662]

B:BD[32.2615] → [8.2656:2757]

    bool death_message =
        (!silent && mons_near(monster) && player_monster_visible(monster));

[32.2615]

[8.2757]

    bool death_message = (!silent && mons_near(monster)
                          && player_monster_visible(monster));

Replacement in crawl-ref/source/monstuff.cc at line 1108 [11.1396662]

B:BD[13.416479] → [33.3686:3805]

                    && (!player_under_penance()
                        && random2(you.piety) >= piety_breakpoint(0)))

[13.416479]

[13.416557]

                    && !player_under_penance()
                    && random2(you.piety) >= piety_breakpoint(0))

Replacement in crawl-ref/source/monstuff.cc at line 1122 [11.1396662]

B:BD[34.4925] → [35.3248:3307]

                        && mons_is_evil_or_unholy(monster)

[34.4925]

[36.4696]

                    && mons_is_evil_or_unholy(monster)

Replacement in crawl-ref/source/monstuff.cc at line 1549 [11.1396662]

B:BD[11.1426598] → [37.5379:5433]

∅:D[37.5433] → [38.1236:1303]

B:BD[13.419726] → [38.1236:1303]

    bool invis = (mons_class_flag( targetc, M_INVIS )
                  || monster->invisible()) && !player_see_invis();

[11.1426598]

[11.1426707]

    bool invis = (!player_see_invis() && (mons_class_flag( targetc, M_INVIS )
                                          || monster->invisible()));

Deletion in crawl-ref/source/monstuff.cc at line 1651 [11.1396662]
B:BD[39.3520] → [39.3520:3538]
```
                {
```
Deletion in crawl-ref/source/monstuff.cc at line 1652 [11.1396662]
B:BD[39.3602] → [39.3602:3620]
```
                }
```
Insertion in crawl-ref/source/monstuff.cc at line 1691 [11.1396662]
[40.2788]
[40.2788]
```
        {
```
Insertion in crawl-ref/source/monstuff.cc at line 1693 [11.1396662]
[40.2816]
[40.2816]
```
        }
```
Insertion in crawl-ref/source/monstuff.cc at line 1734 [11.1396662]
[16.8773]
[16.8773]
```
    {
```
Insertion in crawl-ref/source/monstuff.cc at line 1738 [11.1396662]
[16.8991]
[16.8991]
```
    }
```

Replacement in crawl-ref/source/monstuff.cc at line 1758 [11.1396662]

B:BD[3.235] → [3.235:286]

            || (!see_grid(tx, ty) && restrict_LOS)

[3.235]

[16.9304]

            || restrict_LOS && !see_grid(tx, ty)

Replacement in crawl-ref/source/monstuff.cc at line 1761 [11.1396662]

B:BD[16.9395] → [16.9395:9514]

            || (tx == you.x_pos && ty == you.y_pos)
            || (!allow_adjacent && distance(ox, oy, tx, ty) <= 2))

[16.9395]

[11.1429432]

            || tx == you.x_pos && ty == you.y_pos
            || !allow_adjacent && distance(ox, oy, tx, ty) <= 2)
        {

Insertion in crawl-ref/source/monstuff.cc at line 1765 [11.1396662]
[11.1429454]
[16.9515]
```
        }
```
Replacement in crawl-ref/source/monstuff.cc at line 1780 [11.1396662]
B:BD[16.10266] → [16.10266:10318]
```
        if (!see_grid(tx, ty) && !origin_is_player)
```
[16.10266]
[16.10318]
```
        if (!origin_is_player && !see_grid(tx, ty))
```
Replacement in crawl-ref/source/monstuff.cc at line 2095 [11.1396662]
B:BD[11.1438617] → [11.1438617:1438673]
```
        // assume monsters know where to run from, even
```
[11.1438617]
[11.1438673]
```
        // Assume monsters know where to run from, even
```

Replacement in crawl-ref/source/monstuff.cc at line 2183 [11.1396662]

B:BD[11.1440944] → [11.1440944:1441032]

    // change proxPlayer depending on invisibility and standing
    // in shallow water

[11.1440944]

[38.1304]

    // Change proxPlayer depending on invisibility and standing
    // in shallow water.

Replacement in crawl-ref/source/monstuff.cc at line 2226 [11.1396662]

B:BD[41.876] → [41.876:969]

        // intelligent monsters prefer to attack the player,
        // even when berserking

[41.876]

[41.969]

        // Intelligent monsters prefer to attack the player,
        // even when berserking.

Replacement in crawl-ref/source/monstuff.cc at line 2241 [11.1396662]

B:BD[11.1441882] → [42.2558:2662]

    // friendly and good neutral monsters do not attack other friendly
    // and good neutral monsters

[11.1441882]

[9.13392]

    // Friendly and good neutral monsters do not attack other friendly
    // and good neutral monsters.

Replacement in crawl-ref/source/monstuff.cc at line 2249 [11.1396662]

B:BD[11.1442100] → [43.2760:2832]

    // neutral monsters prefer not to attack players, or other neutrals

[11.1442100]

[6.3416]

    // Neutral monsters prefer not to attack players, or other neutrals.

Deletion in crawl-ref/source/monstuff.cc at line 2292 [11.1396662]

B:BD[11.1443051] → [11.1443051:1443156]


                if (!mons_monster_visible( mon, &menv[mon->foe] ))
                    proxFoe = false;

Replacement in crawl-ref/source/monstuff.cc at line 2293 [11.1396662]

B:BD[11.1443157] → [11.1443157:1443287]

                // XXX monsters will rely on player LOS -- GDL
                if (!see_grid(menv[mon->foe].x, menv[mon->foe].y))

[11.1443157]

[11.1443287]

                if (!mon_can_see_monster(mon, &menv[mon->foe]))

Replacement in crawl-ref/source/monstuff.cc at line 2458 [11.1396662]

B:BD[11.1448970] → [11.1448970:1449039]

            if ((mon->x == mon->target_x && mon->y == mon->target_y)

[11.1448970]

[11.1449039]

            if (mon->x == mon->target_x && mon->y == mon->target_y

Replacement in crawl-ref/source/monstuff.cc at line 2559 [11.1396662]
B:BD[44.671] → [44.671:717]
```
            && mons_monster_visible(mon, foe)
```
[44.671]
[45.4300]
```
            && mon_can_see_monster(mon, foe)
```

Insertion in crawl-ref/source/monstuff.cc at line 2654 [11.1396662]

[46.6460]


                    // True, but it's currently only used for orcs, and
                    // Blork and Urug also being preferred to non-named orcs
                    // is fine, I think. Once more gods name followers (and
                    // prefer them) that should be changed, of course. (jpeg)

Replacement in crawl-ref/source/monstuff.cc at line 2848 [11.1396662]

B:BD[47.2681] → [47.2681:3363]

            || ((grid_distance( monster->x, monster->y,
                                you.x_pos, you.y_pos ) > 1
                 // FIXME This is better expressed as a
                 // function such as
                 // monster_has_ranged_attack:
                 && monster->type != MONS_ELECTRICAL_EEL
                 && monster->type != MONS_LAVA_SNAKE
                 && (monster->type != MONS_MERMAID
                     || you.species == SP_MERFOLK)
                 // Don't submerge if we just unsubmerged for
                 // the sake of shouting.
                 && monster->seen_context != "bursts forth shouting"
                 && !one_chance_in(20)) )

[47.2681]

[47.3363]

            || grid_distance( monster->x, monster->y,
                              you.x_pos, you.y_pos ) > 1
               // FIXME This is better expressed as a
               // function such as
               // monster_has_ranged_attack:
               && monster->type != MONS_ELECTRICAL_EEL
               && monster->type != MONS_LAVA_SNAKE
               && (monster->type != MONS_MERMAID
                   || you.species == SP_MERFOLK)
               // Don't submerge if we just unsubmerged for
               // the sake of shouting.
               && monster->seen_context != "bursts forth shouting"
               && !one_chance_in(20)

Replacement in crawl-ref/source/monstuff.cc at line 3313 [11.1396662]

B:BD[48.4180] → [48.4180:4263]

            || silenced(monster->x, monster->y) || silenced(you.x_pos, you.y_pos))

[48.4180]

[48.4263]

            || silenced(monster->x, monster->y)
            || silenced(you.x_pos, you.y_pos))

Replacement in crawl-ref/source/monstuff.cc at line 3498 [11.1396662]

B:BD[13.423886] → [13.423886:423960]

                if ( mons_friendly(monster) && !player_see_invis(false) )

[13.423886]

[13.423960]

                if (mons_friendly(monster) && !player_see_invis(false))

Replacement in crawl-ref/source/monstuff.cc at line 3502 [11.1396662]

B:BD[11.1480759] → [49.3278:3351]

            // allow monsters to drink these when player in sight (jpeg)

[11.1480759]

[49.3351]

            // Allow monsters to drink these when player in sight. (jpeg)

Replacement in crawl-ref/source/monstuff.cc at line 3542 [11.1396662]

B:BD[11.1481747] → [11.1481747:1481817]

            // this check isn't redundant -- player may be invisible.

[11.1481747]

[4.204]

            // This check isn't redundant -- player may be invisible.

Replacement in crawl-ref/source/monstuff.cc at line 3573 [11.1396662]
B:BD[50.1707] → [50.1707:1740]
```
    // Player saw the item reach
```
[50.1707]
[50.1740]
```
    // Player saw the item reach.
```

Replacement in crawl-ref/source/monstuff.cc at line 4230 [11.1396662]

B:BD[11.1494117] → [51.1466:1539]

            // if nothing found by now, safe friendlies will rarely cast

[11.1494117]

[52.3515]

            // If nothing found by now, safe friendlies will rarely cast.

Replacement in crawl-ref/source/monstuff.cc at line 4326 [11.1396662]

B:BD[11.1497133] → [11.1497133:1497217]

                    else if (!mons_monster_visible( monster, &menv[monster->foe] ))

[11.1497133]

[11.1497217]

                    else if (!mon_can_see_monster(monster, &menv[monster->foe]))

Replacement in crawl-ref/source/monstuff.cc at line 5831 [11.1396662]

B:BD[53.4724] → [53.4724:4816]

    if (monster->type == MONS_WANDERING_MUSHROOM
        && see_grid(targ_x, targ_y))
    {

[53.4724]

[53.4816]

    if (monster->type == MONS_WANDERING_MUSHROOM && see_grid(targ_x, targ_y))

Deletion in crawl-ref/source/monstuff.cc at line 5833 [11.1396662]
B:BD[53.4838] → [53.4838:4844]
```
    }
```
Replacement in crawl-ref/source/monstuff.cc at line 6745 [11.1396662]
B:BD[13.447344] → [13.447344:447380]
```
    if ( monster->flags & MF_SEEN )
```
[13.447344]
[54.688]
```
    if (monster->flags & MF_SEEN)
```

Replacement in crawl-ref/source/monstuff.cc at line 6751 [11.1396662]

∅:D[5.2594] → [55.2204:2383]

B:BD[13.447483] → [55.2204:2383]

    if ( !mons_is_mimic(monster->type)
         && MONST_INTERESTING(monster)
         && monster->type != MONS_PANDEMONIUM_DEMON
         && monster->type != MONS_PLAYER_GHOST )

[5.2594]

[13.447620]

    if (!mons_is_mimic(monster->type)
        && MONST_INTERESTING(monster)
        && monster->type != MONS_PANDEMONIUM_DEMON
        && monster->type != MONS_PLAYER_GHOST)

Replacement in crawl-ref/source/monplace.cc at line 66 [11.1641732]

B:BD[13.451369] → [56.10407:10476]

∅:D[56.10476] → [13.451440:451499]

B:BD[13.451440] → [13.451440:451499]

        return actual_grid >= DNGN_FLOOR
            || (!generation
                    && actual_grid == DNGN_SHALLOW_WATER);

[13.451369]

[13.451499]

    {
        return (actual_grid >= DNGN_FLOOR
                || !generation && actual_grid == DNGN_SHALLOW_WATER);
    }

Replacement in crawl-ref/source/monplace.cc at line 1675 [11.1641732]
B:BD[13.458287] → [13.458287:458336]
```
    else if ( Options.note_monsters.size() > 0 )
```
[13.458287]
[56.10714]
```
    else if (Options.note_monsters.size() > 0)
```

Replacement in crawl-ref/source/monplace.cc at line 1687 [11.1641732]

B:BD[13.458632] → [13.458632:458690]

B:BD[13.458690] → [23.11668:11897]

B:BD[23.11897] → [57.334:387]

B:BD[57.387] → [58.583:650]

    else if ( you.where_are_you == BRANCH_MAIN_DUNGEON &&
              you.level_type == LEVEL_DUNGEON &&
              mons_level(monster->type) >= you.your_level + ood_limit() &&
              mons_level(monster->type) < 99 &&
              !(monster->type >= MONS_EARTH_ELEMENTAL &&
                monster->type <= MONS_AIR_ELEMENTAL)
              && !mons_class_flag( monster->type, M_NO_EXP_GAIN ))

[13.458632]

[23.11952]

    else if (you.where_are_you == BRANCH_MAIN_DUNGEON
             && you.level_type == LEVEL_DUNGEON
             && mons_level(monster->type) >= you.your_level + ood_limit()
             && mons_level(monster->type) < 99
             && !(monster->type >= MONS_EARTH_ELEMENTAL
                  && monster->type <= MONS_AIR_ELEMENTAL)
             && !mons_class_flag( monster->type, M_NO_EXP_GAIN ))
    {

Insertion in crawl-ref/source/monplace.cc at line 1696 [11.1641732]
[23.11980]
[13.458953]
```
    }
```
Replacement in crawl-ref/source/monplace.cc at line 1698 [11.1641732]
B:BD[13.458954] → [13.458954:458977]
```
    if ( interesting )
```
[13.458954]
[23.11981]
```
    if (interesting)
```
Insertion in crawl-ref/source/mon-util.h at line 413 [11.1682293]
[59.493]
[60.3178]
```
bool mon_can_see_monster( const monsters *mon, const monsters *targ );
```

Insertion in crawl-ref/source/mon-util.cc at line 616 [11.1699344]

[11.1706538]

[61.2550]

bool mon_can_see_monster( const monsters *mon, const monsters *targ )
{
    if (!mon->mon_see_grid(targ->x, targ->y))
        return false;
    return (mons_monster_visible(mon, targ));
}

Replacement in crawl-ref/source/mon-util.cc at line 630 [11.1699344]

B:BD[62.11670] → [38.1381:1437]

        || (targ->invisible() && !mons_see_invis(mon)))

[62.11670]

[11.1706864]

        || targ->invisible() && !mons_see_invis(mon))

Replacement in crawl-ref/source/mon-util.cc at line 3576 [11.1699344]

B:BD[63.24291] → [64.2852:2915]

    // XXX: Very simplistic armour evaluation (AC comparison).

[63.24291]

[65.1396]

    // Very simplistic armour evaluation (AC comparison).

Replacement in crawl-ref/source/mon-util.cc at line 3588 [11.1699344]

B:BD[64.2994] → [64.2994:3141]

                // XXX: This is not quite logical as many properties don't
                // apply to monsters (e.g. levitation, blink, berserk).

[64.2994]

[63.24684]

                // XXX: This is not really logical as many properties don't
                //      apply to monsters (e.g. levitation, blink, berserk).

Insertion in crawl-ref/source/mon-util.cc at line 5617 [11.1699344]

[66.1101]

[60.3676]

bool monsters::mon_see_grid(int tx, int ty) const
{
    if (distance(x, y, tx, ty) > LOS_RADIUS * LOS_RADIUS)
        return false;
    // Ignoring clouds for now.
    return (num_feats_between(x, y, tx, ty, DNGN_UNSEEN, DNGN_MAXOPAQUE) == 0);
}

Deletion in crawl-ref/source/mon-util.cc at line 5638 [11.1699344]
∅:D[60.3792] → [66.1384:1441]
B:BD[66.1384] → [66.1384:1441]
B:BD[66.1441] → [2.210:268]
∅:D[2.268] → [66.1486:1508]
B:BD[66.1486] → [66.1486:1508]
```
    int       tx  = mon->x;
    int       ty  = mon->y;
    if (distance(x, y, tx, ty) > LOS_RADIUS * LOS_RADIUS)
        return false;
```

Replacement in crawl-ref/source/mon-util.cc at line 5639 [11.1699344]

B:BD[66.1509] → [66.1509:1621]

    // Ignoring clouds for now.
    return (num_feats_between(x, y, tx, ty, DNGN_UNSEEN, DNGN_MAXOPAQUE) == 0);

[66.1509]

[7.3055]

    return mon_see_grid(mon->x, mon->y);

Replacement in crawl-ref/source/items.cc at line 725 [11.2584728]
B:BD[67.308] → [68.1363:1405]
```
    if ( item.base_type == OBJ_MISSILES )
```
[67.308]
[68.1405]
```
    if (item.base_type == OBJ_MISSILES)
```

Replacement in crawl-ref/source/items.cc at line 736 [11.2584728]

B:BD[68.1794] → [69.466:580]

    if ( item_glows || (item_runed && !heav_runed) ||
         get_equip_desc(item) == ISFLAG_EMBROIDERED_SHINY )

[68.1794]

[69.580]

    if (item_glows || item_runed && !heav_runed
        || get_equip_desc(item) == ISFLAG_EMBROIDERED_SHINY)

Replacement in crawl-ref/source/items.cc at line 742 [11.2584728]

B:BD[68.1866] → [68.1866:1970]

    // You can tell artefacts, because they'll have a description which
    // rules out anything else.

[68.1866]

[68.1970]

    // You can tell something is an artefacts, because they'll have a
    // description which rules out anything else.

Replacement in crawl-ref/source/externs.h at line 1211 [11.3270163]

B:BD[59.3274] → [60.4565:4614]

    bool visible_to(const actor *looker) const ;

[59.3274]

[60.4614]

    bool visible_to(const actor *looker) const;
    bool mon_see_grid(int tx, int ty) const;

Replacement in crawl-ref/source/directn.cc at line 489 [11.3697945]

B:BD[70.219] → [71.447:503]

    if ( Options.default_target && mode == TARG_ENEMY )

[70.219]

[70.314]

    if (Options.default_target && mode == TARG_ENEMY)

Replacement in crawl-ref/source/directn.cc at line 492 [11.3697945]

B:BD[71.572] → [71.572:640]

        if ( you.prev_targ != MHITNOT && you.prev_targ != MHITYOU )

[71.572]

[70.449]

        if (you.prev_targ != MHITNOT && you.prev_targ != MHITYOU)

Replacement in crawl-ref/source/directn.cc at line 495 [11.3697945]

B:BD[71.703] → [72.5004:5234]

            if ( mons_near(montarget) && player_monster_visible(montarget)
                 && !mons_friendly(montarget) // not made friendly since then
                 && _is_target_in_range(montarget->x, montarget->y, range) )

[71.703]

[71.778]

            if (mons_near(montarget) && player_monster_visible(montarget)
                && !mons_friendly(montarget) // not made friendly since then
                && _is_target_in_range(montarget->x, montarget->y, range))

Replacement in crawl-ref/source/decks.cc at line 2311 [11.3987460]

B:BD[12.51514] → [12.51514:51570]

                    mgen_data(RANDOM_ELEMENT(statues),

[12.51514]

[12.51570]

                    mgen_data(RANDOM_ELEMENT(statues),

Replacement in crawl-ref/source/decks.cc at line 2545 [11.3987460]
B:BD[12.52038] → [12.52038:52070]
```
        mgen_data( mon_chosen, 
```
[12.52038]
[12.52070]
```
        mgen_data( mon_chosen,
```
Replacement in crawl-ref/source/decks.cc at line 2590 [11.3987460]
B:BD[73.1094] → [73.1094:1124]
```
            if ( coinflip() )
```
[73.1094]
[73.1124]
```
            if (coinflip())
            {
```
Insertion in crawl-ref/source/decks.cc at line 2594 [11.3987460]
[73.1256]
[73.1256]
```
            }
```
Replacement in crawl-ref/source/decks.cc at line 2650 [11.3987460]
B:BD[12.52718] → [12.52718:52755]
```
            skeltypes[power_level], 
```
[12.52718]
[12.52755]
```
            skeltypes[power_level],
```
Replacement in crawl-ref/source/decks.cc at line 2670 [11.3987460]
B:BD[12.52936] → [12.52936:52962]
```
        mgen_data( ugly, 
```
[12.52936]
[74.2462]
```
        mgen_data( ugly,
```

Replacement in crawl-ref/source/beam.cc at line 1307 [11.4128068]

B:BD[17.14263] → [17.14263:14317]

                     (pbolt.is_big_cloud) ? "+" : "",

[17.14263]

[13.1228230]

                 (pbolt.is_big_cloud) ? "+" : "",

Replacement in crawl-ref/source/beam.cc at line 1324 [11.4128068]
B:BD[11.4170676] → [75.4690:4717]
```
    if ( pbolt.chose_ray )
```
[11.4170676]
[75.4717]
```
    if (pbolt.chose_ray)
```
Replacement in crawl-ref/source/beam.cc at line 1334 [11.4128068]
B:BD[11.4170795] → [13.1228789:1228821]
```
    if ( !pbolt.aimed_at_feet )
```
[11.4170795]
[76.8635]
```
    if (!pbolt.aimed_at_feet)
```

Replacement in crawl-ref/source/acr.cc at line 3730 [11.4397395]

B:BD[77.3048] → [78.4751:4803]

            // XXX: better flavor for larger doors?

[77.3048]

            // XXX: better flavour for larger doors?

Replacement in crawl-ref/source/acr.cc at line 4241 [11.4397395]

B:BD[11.4475515] → [13.1281327:1281425]

            // we don't want to create a penalty if there isn't
            // supposed to be one

[11.4475515]

[13.1281425]

            // We don't want to create a penalty if there isn't
            // supposed to be one.

Pull code from mon->can_see(target) into a new function mon->see_grid()

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/view.cc at line 2975 [11.16817]

Insertion in crawl-ref/source/view.cc at line 2979 [11.16817]

Replacement in crawl-ref/source/spells4.cc at line 592 [11.436250]

Replacement in crawl-ref/source/spells4.cc at line 1977 [11.436250]

Replacement in crawl-ref/source/spells4.cc at line 1979 [11.436250]

Replacement in crawl-ref/source/spells4.cc at line 1983 [11.436250]

Replacement in crawl-ref/source/spells4.cc at line 2012 [11.436250]

Replacement in crawl-ref/source/spells4.cc at line 2016 [11.436250]

Replacement in crawl-ref/source/spells4.cc at line 2061 [11.436250]

Replacement in crawl-ref/source/spells4.cc at line 2073 [11.436250]

Replacement in crawl-ref/source/spells4.cc at line 2084 [11.436250]

Replacement in crawl-ref/source/spells4.cc at line 2110 [11.436250]

Replacement in crawl-ref/source/spells4.cc at line 2163 [11.436250]

Replacement in crawl-ref/source/spells4.cc at line 2171 [11.436250]

Replacement in crawl-ref/source/spells4.cc at line 2179 [11.436250]

Replacement in crawl-ref/source/spells4.cc at line 2181 [11.436250]

Replacement in crawl-ref/source/spells4.cc at line 2190 [11.436250]

Replacement in crawl-ref/source/spells4.cc at line 2209 [11.436250]

Replacement in crawl-ref/source/spells4.cc at line 2216 [11.436250]

Replacement in crawl-ref/source/spells4.cc at line 2241 [11.436250]

Replacement in crawl-ref/source/spells4.cc at line 2267 [11.436250]

Replacement in crawl-ref/source/spells4.cc at line 2319 [11.436250]

Replacement in crawl-ref/source/spells4.cc at line 2352 [11.436250]

Replacement in crawl-ref/source/spells4.cc at line 2355 [11.436250]

Replacement in crawl-ref/source/spells4.cc at line 2370 [11.436250]

Replacement in crawl-ref/source/spells4.cc at line 2375 [11.436250]

Insertion in crawl-ref/source/spells4.cc at line 2380 [11.436250]

Deletion in crawl-ref/source/spells4.cc at line 2383 [11.436250]

Replacement in crawl-ref/source/spells4.cc at line 2408 [11.436250]

Replacement in crawl-ref/source/player.cc at line 4934 [11.962854]

Deletion in crawl-ref/source/player.cc at line 4978 [11.962854]

Replacement in crawl-ref/source/player.cc at line 4979 [11.962854]

Replacement in crawl-ref/source/player.cc at line 5953 [11.962854]

Insertion in crawl-ref/source/player.cc at line 5985 [11.962854]

Replacement in crawl-ref/source/player.cc at line 5990 [11.962854]

Insertion in crawl-ref/source/player.cc at line 5995 [11.962854]

Deletion in crawl-ref/source/mstuff2.cc at line 53 [11.1340842]

Replacement in crawl-ref/source/monstuff.cc at line 763 [11.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 778 [11.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 872 [11.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 1108 [11.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 1122 [11.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 1549 [11.1396662]

Deletion in crawl-ref/source/monstuff.cc at line 1651 [11.1396662]

Deletion in crawl-ref/source/monstuff.cc at line 1652 [11.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 1691 [11.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 1693 [11.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 1734 [11.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 1738 [11.1396662]