fiddlerwoaroof/crawl - Change RKBYUVD6HHZZ6GIEELNTOEWAQ2P3C2IMQSRH4XFVLCDZZHKNGJ4AC

Move mons_player_visible into player::visible_to.

Created by Robert Vollmert on October 22, 2009

RKBYUVD6HHZZ6GIEELNTOEWAQ2P3C2IMQSRH4XFVLCDZZHKNGJ4AC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/view.cc at line 917 [7.16817]
∅:D[5.41] → [6.520:590]
∅:D[8.45] → [6.520:590]
∅:D[9.46] → [6.520:590]
B:BD[6.520] → [6.520:590]
```
        && mons_player_visible(monster) && !mons_is_sleeping(monster)
```
[8.45]
[10.8]
```
        && monster->can_see_invisible() && !mons_is_sleeping(monster)
```

Replacement in crawl-ref/source/view.cc at line 957 [7.16817]

∅:D[11.393] → [12.408:478]

B:BD[12.408] → [12.408:478]

        && mons_player_visible(monster) && !mons_is_sleeping(monster)

[11.393]

[10.155]

        && monster->can_see_invisible() && !mons_is_sleeping(monster)

Replacement in crawl-ref/source/view.cc at line 992 [7.16817]

B:BD[13.408] → [13.408:478]

        && mons_player_visible(monster) && !mons_is_sleeping(monster)

[13.408]

[13.478]

        && monster->can_see_invisible() && !mons_is_sleeping(monster)

Replacement in crawl-ref/source/view.cc at line 1484 [7.16817]
B:BD[7.48200] → [7.48200:48239]
```
    if (!mons_player_visible(monster))
```
[7.48200]
[14.119]
```
    if (!monster->can_see_invisible())
```

Replacement in crawl-ref/source/view.cc at line 1509 [7.16817]

B:BD[15.111] → [15.111:166]

    if (you.backlit() && mons_player_visible(monster))

[15.111]

[15.166]

    if (you.backlit() && monster->can_see_invisible())

Replacement in crawl-ref/source/religion.cc at line 5657 [7.804403]
∅:D[16.4216] → [17.39768:39817]
B:BD[17.39768] → [17.39768:39817]
```
                if (mons_player_visible(monster)
```
[16.4216]
[17.39817]
```
                if (monster->can_see_invisible()
```
Replacement in crawl-ref/source/religion.cc at line 7460 [7.804403]
B:BD[18.5433] → [18.5433:5477]
```
            if (!mons_player_visible(mons))
```
[18.5433]
[18.5477]
```
            if (!mons->can_see_invisible())
```

Replacement in crawl-ref/source/player.cc at line 7362 [7.962854]

∅:D[19.296] → [20.450:487]

B:BD[20.450] → [20.450:487]

    return mons_player_visible(mon);

[19.296]

[3.2819]

    return (!you.invisible() || player_in_water() ||
            mon->can_see_invisible() || mons_sense_invis(mon));

Replacement in crawl-ref/source/monstuff.cc at line 4391 [7.1396662]
B:BD[7.1441071] → [7.1441071:1441112]
```
        if (!mons_player_visible( mon ))
```
[7.1441071]
[7.1441112]
```
        if (!mon->can_see_invisible())
```

Replacement in crawl-ref/source/monstuff.cc at line 4835 [7.1396662]

B:BD[21.25765] → [21.25765:25822]

        && mons_player_visible(mon) && !is_sanctuary(p))

[21.25765]

[22.499]

        && mon->can_see_invisible() && !is_sanctuary(p))

Replacement in crawl-ref/source/monstuff.cc at line 5964 [7.1396662]
B:BD[7.1472805] → [2.2776:2819]
```
        if (!mons_player_visible(monster))
```
[7.1472805]
[23.12193]
```
        if (!monster->can_see_invisible())
```
Replacement in crawl-ref/source/monstuff.cc at line 5999 [7.1396662]
B:BD[7.1473690] → [7.1473690:1473735]
```
        if (!mons_player_visible( monster ))
```
[7.1473690]
[7.1473735]
```
        if (!monster->can_see_invisible())
```
Replacement in crawl-ref/source/monstuff.cc at line 6158 [7.1396662]
B:BD[7.1476737] → [24.2616:2661]
```
        if (!mons_player_visible( monster ))
```
[7.1476737]
[23.12773]
```
        if (!monster->can_see_invisible())
```
Replacement in crawl-ref/source/monstuff.cc at line 6234 [7.1396662]
B:BD[7.1478208] → [24.2710:2755]
```
        if (!mons_player_visible( monster ))
```
[7.1478208]
[23.12915]
```
        if (!monster->can_see_invisible())
```

Replacement in crawl-ref/source/monstuff.cc at line 7080 [7.1396662]

B:BD[7.1496776] → [25.3023:3081]

                        if (!mons_player_visible(monster)

[7.1496776]

[17.49848]

                        if (!monster->can_see_invisible()

Deletion in crawl-ref/source/mon-util.h at line 519 [7.1682293]
B:BD[26.3005] → [26.3005:3052]
```
bool mons_player_visible(const monsters *mon);
```
Deletion in crawl-ref/source/mon-util.cc at line 915 [7.1699344]
∅:D[27.1437] → [7.1706864:1706923]
∅:D[4.2864] → [7.1706864:1706923]
∅:D[28.10093] → [7.1706864:1706923]
∅:D[29.11735] → [7.1706864:1706923]
B:BD[7.1706864] → [7.1706864:1706923]
B:BD[7.1706923] → [30.2619:2689]
∅:D[30.2689] → [7.1706994:1707062]
B:BD[7.1706994] → [7.1706994:1707062]
B:BD[7.1707062] → [26.3493:3539]
∅:D[19.3421] → [7.1707111:1707113]
∅:D[26.3539] → [7.1707111:1707113]
B:BD[7.1707111] → [7.1707111:1707113]
B:BD[7.1707113] → [27.1438:1463]
```
    {
        return (false);
    }
    return (true);
}
// This does NOT do line of sight!  It checks the player's visibility
// with respect to mon's perception, but doesn't do walls or range.
bool mons_player_visible(const monsters *mon)
{
    if (you.invisible())
```
Deletion in crawl-ref/source/mon-util.cc at line 916 [7.1699344]
B:BD[7.1707138] → [7.1707138:1707197]
B:BD[7.1707197] → [4.2865:2928]
∅:D[31.770] → [7.1707232:1707260]
∅:D[32.2632] → [7.1707232:1707260]
∅:D[4.2928] → [7.1707232:1707260]
B:BD[7.1707232] → [7.1707232:1707260]
```
        if (player_in_water())
            return (true);
        if (mon->can_see_invisible() || mons_sense_invis(mon))
            return (true);
```

Move mons_player_visible into player::visible_to.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/view.cc at line 917 [7.16817]

Replacement in crawl-ref/source/view.cc at line 957 [7.16817]

Replacement in crawl-ref/source/view.cc at line 992 [7.16817]

Replacement in crawl-ref/source/view.cc at line 1484 [7.16817]

Replacement in crawl-ref/source/view.cc at line 1509 [7.16817]

Replacement in crawl-ref/source/religion.cc at line 5657 [7.804403]

Replacement in crawl-ref/source/religion.cc at line 7460 [7.804403]

Replacement in crawl-ref/source/player.cc at line 7362 [7.962854]

Replacement in crawl-ref/source/monstuff.cc at line 4391 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 4835 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 5964 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 5999 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 6158 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 6234 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 7080 [7.1396662]

Deletion in crawl-ref/source/mon-util.h at line 519 [7.1682293]

Deletion in crawl-ref/source/mon-util.cc at line 915 [7.1699344]

Deletion in crawl-ref/source/mon-util.cc at line 916 [7.1699344]