fiddlerwoaroof/crawl - Change FAXIQ43BLFCLIL6ZOBTIKHU6RWEXSRQ2TS567UVZM7VV3V3GHELAC

Get rid of player_monster_visible.

The special casing for drowning monsters appears to have been obsoloted by checking ENCH_SUBMERGED instead of calling mons_is_submerged.

Created by Robert Vollmert on October 22, 2009

FAXIQ43BLFCLIL6ZOBTIKHU6RWEXSRQ2TS567UVZM7VV3V3GHELAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/view.cc at line 1083 [10.16817]

B:BD[8.522] → [9.283:346]

    if (s_type == S_SILENT && !player_monster_visible(monster)

[8.522]

[3.7]

    if (s_type == S_SILENT && !monster->visible_to(&you)

Replacement in crawl-ref/source/view.cc at line 1309 [10.16817]
B:BD[11.579] → [11.579:623]
```
    if (!player_monster_visible( monster ))
```
[11.579]
[11.623]
```
    if (!monster->visible_to(&you))
```

Replacement in crawl-ref/source/view.cc at line 1429 [10.16817]

B:BD[12.342] → [12.342:396]

            else if (player_monster_visible(monster))

[12.342]

[13.322]

            else if (monster->visible_to(&you))

Replacement in crawl-ref/source/tutorial.cc at line 4458 [15.5936]

B:BD[14.23538] → [14.23538:23601]

    return (!player_monster_visible(mon) && !mons_flies(mon));

[14.23538]

[14.23601]

    return (!mon->visible_to(&you) && !mons_flies(mon));

Replacement in crawl-ref/source/travel.cc at line 571 [17.39949]
B:BD[16.204] → [16.204:248]
```
            && player_monster_visible(mons)
```
[16.204]
[16.248]
```
            && mons->visible_to(&you)
```

Replacement in crawl-ref/source/traps.cc at line 260 [18.5308]

B:BD[18.8352] → [18.8352:8412]

        if (mons_near(mon) && !player_monster_visible(mon))

[18.8352]

[18.8412]

        if (mons_near(mon) && !mon->visible_to(&you))

Replacement in crawl-ref/source/traps.cc at line 314 [18.5308]

B:BD[19.460] → [19.460:506]

            if (player_monster_visible(mons))

[19.460]

[19.506]

            if (mons->visible_to(&you))

Replacement in crawl-ref/source/traps.cc at line 475 [18.5308]

B:BD[20.7460] → [20.7460:7513]

                    if (player_monster_visible( m ))

[20.7460]

[20.7513]

                    if (m->visible_to(&you))

Replacement in crawl-ref/source/traps.cc at line 562 [18.5308]

B:BD[21.897] → [21.897:948]

                    if (player_monster_visible(m))

[21.897]

[21.948]

                    if (m->visible_to(&you))

Replacement in crawl-ref/source/traps.cc at line 833 [18.5308]

B:BD[18.18739] → [18.18739:18798]

    if (!player_monster_visible(mon)) // makes this harder

[18.18739]

[18.18798]

    if (!mon->visible_to(&you)) // makes this harder

Replacement in crawl-ref/source/traps.cc at line 855 [18.5308]
B:BD[18.19445] → [18.19445:19490]
```
            if (player_monster_visible(mon))
```
[18.19445]
[18.19490]
```
            if (mon->visible_to(&you))
```
Replacement in crawl-ref/source/traps.cc at line 872 [18.5308]
∅:D[22.2218] → [18.19980:20017]
B:BD[18.19980] → [18.19980:20017]
```
    if (player_monster_visible(mon))
```
[22.2218]
[18.20017]
```
    if (mon->visible_to(&you))
```
Replacement in crawl-ref/source/tilepick.cc at line 4634 [25.96318]
B:BD[23.1836] → [24.241:282]
```
        if (!player_monster_visible(mon)
```
[23.1836]
[23.1878]
```
        if (!mon->visible_to(&you)
```
Replacement in crawl-ref/source/state.cc at line 244 [26.1546]
B:BD[26.7192] → [26.7192:7236]
```
            && player_monster_visible(mon))
```
[26.7192]
[26.7236]
```
            && mon->visible_to(&you))
```
Replacement in crawl-ref/source/spl-cast.cc at line 648 [10.293070]
B:BD[27.2881] → [27.2881:2922]
```
        if (!player_monster_visible(mon)
```
[27.2881]
[27.2922]
```
        if (!mon->visible_to(&you)
```

Replacement in crawl-ref/source/spells2.cc at line 200 [10.569242]

B:BD[28.2241] → [28.2241:2306]

            if (!mons_near(mon) || !player_monster_visible(mon))

[28.2241]

[28.2306]

            if (!mons_near(mon) || !mon->visible_to(&you))

Replacement in crawl-ref/source/religion.cc at line 7462 [10.804403]
B:BD[29.5505] → [29.5505:5552]
```
            if (!player_monster_visible(mons))
```
[29.5505]
[29.5552]
```
            if (!mons->visible_to(&you))
```

Deletion in crawl-ref/source/player.h at line 759 [10.945993]

B:BD[10.956158] → [10.956158:956487]

B:BD[30.2400] → [31.2608:2658]

∅:D[31.2658] → [10.956578:956579]

∅:D[32.336730] → [10.956578:956579]

B:BD[10.956578] → [10.956578:956579]

/* ***********************************************************************
 * called from: beam - decks - direct - effects - fight - files - it_use2 -
 *              items - monstuff - mon-util - mstuff2 - spells1 - spells2 -
 *              spells3
 * *********************************************************************** */
bool player_monster_visible(const monsters *mon);

Deletion in crawl-ref/source/player.cc at line 2703 [10.962854]

∅:D[33.7545] → [10.1003310:1003313]

B:BD[10.1003310] → [10.1003310:1003313]

B:BD[10.1003313] → [34.4644:4715]

B:BD[34.4715] → [31.2773:2840]

B:BD[31.2840] → [4.2617:2690]

∅:D[4.2690] → [31.2922:2971]

B:BD[31.2922] → [31.2922:2971]

∅:D[31.2971] → [10.1003583:1003585]

∅:D[32.348323] → [10.1003583:1003585]

B:BD[10.1003583] → [10.1003583:1003585]

B:BD[10.1003585] → [7.3228:3282]

∅:D[35.2662] → [10.1003706:1003730]

∅:D[7.3282] → [10.1003706:1003730]

B:BD[10.1003706] → [10.1003706:1003730]

B:BD[10.1003736] → [10.1003736:1003737]

B:BD[35.2779] → [36.2613:2725]

∅:D[36.2725] → [35.2856:2857]

B:BD[35.2856] → [35.2856:2857]

B:BD[35.2857] → [37.4029:4402]

∅:D[37.4402] → [36.2976:3000]

B:BD[36.2976] → [36.2976:3000]

B:BD[36.3000] → [37.4403:4404]

∅:D[37.4404] → [36.3009:3040]

B:BD[36.3009] → [36.3009:3040]

}
// This does NOT do line of sight!  It checks the monster's visibility
// with respect to the players perception, but doesn't do walls or
// range.  To find if the square the monster is in LOS, see mons_near().
bool player_monster_visible(const monsters *mon)
{
    if (!you.can_see_invisible() && mon->invisible())
        return (false);
    if (!mons_is_submerged(mon))
        return (true);
    const dungeon_feature_type feat = grd(mon->pos());
    // Treat monsters who are submerged due to drowning as visible, so
    // we get proper messages when they die.  Monsters can only drown in
    // lava or deep water, so monsters that are "submerged" in other
    // features (air elementals in air, trapdoor spiders in the floor)
    // are exempt from this check.
    if (feat != DNGN_LAVA && feat != DNGN_DEEP_WATER)
        return (false);
    return (mon->can_drown());

Replacement in crawl-ref/source/player.cc at line 7152 [10.962854]
∅:D[38.2774] → [39.452:518]
∅:D[40.3591] → [39.452:518]
B:BD[39.452] → [39.452:518]
```
             KILLED_BY_MONSTER, "", player_monster_visible(mon));
```
[38.2774]
[39.518]
```
             KILLED_BY_MONSTER, "", mon->visible_to(&you));
```
Replacement in crawl-ref/source/ouch.cc at line 787 [10.1104358]
B:BD[10.1118441] → [41.3795:3841]
```
        if (!player_monster_visible(monster))
```
[10.1118441]
[41.3841]
```
        if (!monster->visible_to(&you))
```
Replacement in crawl-ref/source/mstuff2.cc at line 1351 [10.1340842]
B:BD[32.400736] → [42.1730:1786]
```
    if (player_monster_visible(monster) && now_visible)
```
[32.400736]
[5.2642]
```
    if (monster->visible_to(&you) && now_visible)
```

Replacement in crawl-ref/source/monstuff.cc at line 1439 [10.1396662]

B:BD[43.2699] → [43.2699:2766]

                               && (player_monster_visible(monster)

[43.2699]

[43.2766]

                               && (monster->visible_to(&you)

Replacement in crawl-ref/source/monstuff.cc at line 1978 [10.1396662]

B:BD[44.11223] → [44.11223:11287]

    if (mons_near(monster) && !player_monster_visible(monster))

[44.11223]

[44.11287]

    if (mons_near(monster) && !monster->visible_to(&you))

Replacement in crawl-ref/source/monstuff.cc at line 4963 [10.1396662]

B:BD[45.7002] → [46.2742:2812]

            || player_monster_visible(monster) || crawl_state.arena))

[45.7002]

[10.1451555]

            || monster->visible_to(&you) || crawl_state.arena))

Replacement in crawl-ref/source/monplace.cc at line 921 [10.1641732]
B:BD[10.1650854] → [10.1650854:1650903]
```
        if (player_monster_visible( &menv[id] ))
```
[10.1650854]
[47.2217]
```
        if (menv[id].visible_to(&you))
```
Replacement in crawl-ref/source/mon-util.cc at line 5939 [10.1699344]
B:BD[48.12951] → [48.12951:13013]
```
    return (mons_near(this) && player_monster_visible(this));
```
[48.12951]
[48.13013]
```
    return (mons_near(this) && visible_to(&you));
```
Replacement in crawl-ref/source/mon-util.cc at line 7004 [10.1699344]
B:BD[49.16294] → [2.198:259]
```
        if (mons_near(this) && player_monster_visible(this))
```
[49.16294]
[2.259]
```
        if (you.can_see(this))
```
Replacement in crawl-ref/source/mon-util.cc at line 7025 [10.1699344]
B:BD[50.1627] → [50.1627:1673]
```
            if (player_monster_visible(this))
```
[50.1627]
[50.1673]
```
            if (visible_to(&you))
```

Replacement in crawl-ref/source/mon-util.cc at line 7424 [10.1699344]

B:BD[51.14439] → [51.14439:14505]

            if (mons_near(this) && !player_monster_visible(this))

[51.14439]

[51.14505]

            if (mons_near(this) && !visible_to(&you))

Replacement in crawl-ref/source/mon-util.cc at line 7442 [10.1699344]
∅:D[22.11829] → [51.15227:15293]
B:BD[51.15227] → [51.15227:15293]
```
            if (mons_near(this) && !player_monster_visible(this))
```
[22.11829]
[51.15293]
```
            if (mons_near(this) && !visible_to(&you))
```

Replacement in crawl-ref/source/mon-util.cc at line 7500 [10.1699344]

B:BD[51.16727] → [51.16727:16781]

                    if (player_monster_visible(this))

[51.16727]

[51.16781]

                    if (visible_to(&you))

Replacement in crawl-ref/source/mon-util.cc at line 7629 [10.1699344]

B:BD[52.3227] → [52.3227:3292]

            if (mons_near(this) && player_monster_visible(this))

[52.3227]

[52.3292]

            if (mons_near(this) && visible_to(&you))

Replacement in crawl-ref/source/mon-util.cc at line 8188 [10.1699344]
B:BD[53.15538] → [54.1593:1643]
```
                if (player_monster_visible(this))
```
[53.15538]
[55.6578]
```
                if (visible_to(&you))
```

Replacement in crawl-ref/source/mon-util.cc at line 8474 [10.1699344]

B:BD[56.5798] → [56.5798:5866]

                                   && player_monster_visible(this);

[56.5798]

[22.11915]

                                   && visible_to(&you);

Replacement in crawl-ref/source/misc.cc at line 2832 [10.1933596]

B:BD[57.3279] → [57.3279:3348]

                && (!require_visible || player_monster_visible(mon))

[57.3279]

[57.3348]

                && (!require_visible || mon->visible_to(&you))

Replacement in crawl-ref/source/files.cc at line 1068 [10.3084589]
B:BD[58.8371] → [59.3685:3732]
```
            if (player_monster_visible(fmenv))
```
[58.8371]
[59.3732]
```
            if (fmenv->visible_to(&you))
```

Replacement in crawl-ref/source/directn.cc at line 281 [10.3697945]

B:BD[60.1224] → [60.1224:1283]

        if (mons->alive() && player_monster_visible(mons))

[60.1181]

[60.1283]

        if (mons->alive() && mons->visible_to(&you))

Replacement in crawl-ref/source/directn.cc at line 303 [10.3697945]
∅:D[61.10710] → [62.6647:6691]
∅:D[63.92287] → [62.6647:6691]
B:BD[62.6647] → [62.6647:6691]
```
            && !player_monster_visible(mon)
```
[61.10710]
[62.6691]
```
            && !mon->visible_to(&you)
```
Replacement in crawl-ref/source/directn.cc at line 1815 [10.3697945]
B:BD[64.7928] → [65.13000:13046]
```
    if (mons && player_monster_visible(mons))
```
[64.7928]
[64.7994]
```
    if (mons && mons->visible_to(&you))
```
Replacement in crawl-ref/source/directn.cc at line 1858 [10.3697945]
B:BD[66.9996] → [65.13152:13198]
```
    if (mons && player_monster_visible(mons))
```
[66.9996]
[66.10062]
```
    if (mons && mons->visible_to(&you))
```
Replacement in crawl-ref/source/directn.cc at line 1958 [10.3697945]
B:BD[67.3742] → [67.3742:3780]
```
    if (!player_monster_visible(mon))
```
[67.3742]
[67.3780]
```
    if (!mon->visible_to(&you))
```
Replacement in crawl-ref/source/directn.cc at line 2097 [10.3697945]
B:BD[65.13783] → [65.13783:13820]
```
        && player_monster_visible(m)
```
[65.13783]
[65.13820]
```
        && m->visible_to(&you)
```
Replacement in crawl-ref/source/directn.cc at line 3371 [10.3697945]
B:BD[10.3718680] → [68.5531:5573]
```
        if (!player_monster_visible(mon))
```
[10.3718680]
[69.5397]
```
        if (!mon->visible_to(&you))
```
Replacement in crawl-ref/source/directn.cc at line 3374 [10.3697945]
B:BD[10.3718813] → [68.5574:5616]
```
        if (!player_monster_visible(mon))
```
[10.3718813]
[10.3718862]
```
        if (!mon->visible_to(&you))
```

Replacement in crawl-ref/source/delay.cc at line 1932 [10.3963459]

B:BD[70.523] → [71.1185:1261]

        if (mon && !player_monster_visible(mon) && !mons_is_submerged(mon))

[70.523]

[44.15876]

        if (mon && !mon->visible_to(&you) && !mons_is_submerged(mon))

Replacement in crawl-ref/source/beam.cc at line 140 [10.4128068]
B:BD[32.1221000] → [6.3533:3585]
```
        if (!force && !player_monster_visible(mon))
```
[32.1221000]
[32.1221054]
```
        if (!force && !mon->visible_to(&you))
```

Replacement in crawl-ref/source/beam.cc at line 5207 [10.4128068]

B:BD[72.64131] → [72.64131:64198]

                     player_monster_visible(mon) ? "for a moment."

[72.64131]

[72.64198]

                     mon->visible_to(&you) ? "for a moment."

Replacement in crawl-ref/source/beam.cc at line 5210 [10.4128068]

B:BD[72.64269] → [72.64269:64319]

                if (!player_monster_visible(mon))

[72.64269]

[73.4448]

                if (!mon->visible_to(&you))

Replacement in crawl-ref/source/AppHdr.cc at line 3 [74.4031]
B:BD[74.4094] → [74.4094:4113]
```
#include "AppHdr.h"
```
[74.4094]
```
#include "AppHdr.h"
```

Get rid of player_monster_visible.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/view.cc at line 1083 [10.16817]

Replacement in crawl-ref/source/view.cc at line 1309 [10.16817]

Replacement in crawl-ref/source/view.cc at line 1429 [10.16817]

Replacement in crawl-ref/source/tutorial.cc at line 4458 [15.5936]

Replacement in crawl-ref/source/travel.cc at line 571 [17.39949]

Replacement in crawl-ref/source/traps.cc at line 260 [18.5308]

Replacement in crawl-ref/source/traps.cc at line 314 [18.5308]

Replacement in crawl-ref/source/traps.cc at line 475 [18.5308]

Replacement in crawl-ref/source/traps.cc at line 562 [18.5308]

Replacement in crawl-ref/source/traps.cc at line 833 [18.5308]

Replacement in crawl-ref/source/traps.cc at line 855 [18.5308]

Replacement in crawl-ref/source/traps.cc at line 872 [18.5308]

Replacement in crawl-ref/source/tilepick.cc at line 4634 [25.96318]

Replacement in crawl-ref/source/state.cc at line 244 [26.1546]

Replacement in crawl-ref/source/spl-cast.cc at line 648 [10.293070]

Replacement in crawl-ref/source/spells2.cc at line 200 [10.569242]

Replacement in crawl-ref/source/religion.cc at line 7462 [10.804403]

Deletion in crawl-ref/source/player.h at line 759 [10.945993]

Deletion in crawl-ref/source/player.cc at line 2703 [10.962854]

Replacement in crawl-ref/source/player.cc at line 7152 [10.962854]

Replacement in crawl-ref/source/ouch.cc at line 787 [10.1104358]

Replacement in crawl-ref/source/mstuff2.cc at line 1351 [10.1340842]

Replacement in crawl-ref/source/monstuff.cc at line 1439 [10.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 1978 [10.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 4963 [10.1396662]

Replacement in crawl-ref/source/monplace.cc at line 921 [10.1641732]

Replacement in crawl-ref/source/mon-util.cc at line 5939 [10.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 7004 [10.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 7025 [10.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 7424 [10.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 7442 [10.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 7500 [10.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 7629 [10.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 8188 [10.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 8474 [10.1699344]

Replacement in crawl-ref/source/misc.cc at line 2832 [10.1933596]

Replacement in crawl-ref/source/files.cc at line 1068 [10.3084589]

Replacement in crawl-ref/source/directn.cc at line 281 [10.3697945]

Replacement in crawl-ref/source/directn.cc at line 303 [10.3697945]

Replacement in crawl-ref/source/directn.cc at line 1815 [10.3697945]

Replacement in crawl-ref/source/directn.cc at line 1858 [10.3697945]

Replacement in crawl-ref/source/directn.cc at line 1958 [10.3697945]

Replacement in crawl-ref/source/directn.cc at line 2097 [10.3697945]

Replacement in crawl-ref/source/directn.cc at line 3371 [10.3697945]

Replacement in crawl-ref/source/directn.cc at line 3374 [10.3697945]

Replacement in crawl-ref/source/delay.cc at line 1932 [10.3963459]

Replacement in crawl-ref/source/beam.cc at line 140 [10.4128068]

Replacement in crawl-ref/source/beam.cc at line 5207 [10.4128068]

Replacement in crawl-ref/source/beam.cc at line 5210 [10.4128068]

Replacement in crawl-ref/source/AppHdr.cc at line 3 [74.4031]