fiddlerwoaroof/crawl - Change E3OI7XFKECKFLJT3KMTGCUDNXEJGS5I6DDV6X3VJPU2R53YSPLXQC

Fold mon_can_see_monster and mons_monster_visible into monsters.

Created by Robert Vollmert on October 22, 2009

E3OI7XFKECKFLJT3KMTGCUDNXEJGS5I6DDV6X3VJPU2R53YSPLXQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/mstuff2.cc at line 1220 [7.1340842]

B:BD[6.6943] → [6.6943:6996]

            if (!mon_can_see_monster(monster, targ))

[6.6943]

[6.6996]

            if (!monster->can_see(targ))

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

B:BD[7.1443157] → [8.7223:7287]

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

[7.1443157]

[7.1443287]

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

Replacement in crawl-ref/source/monstuff.cc at line 4844 [7.1396662]
B:BD[9.671] → [8.7356:7401]
```
            && mon_can_see_monster(mon, foe)
```
[9.671]
[10.25897]
```
            && mon->can_see(foe)
```

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

B:BD[7.1497133] → [11.3082:3213]

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

[7.1497133]

[7.1497217]

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

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

B:BD[12.493] → [13.2866:3005]

bool mon_can_see_monster(const monsters *mon, const monsters *targ);
bool mons_monster_visible(const monsters *mon, const monsters *targ);

Deletion in crawl-ref/source/mon-util.cc at line 899 [7.1699344]
B:BD[12.709] → [14.3161:3163]
∅:D[14.3163] → [7.1706537:1706538]
B:BD[7.1706537] → [7.1706537:1706538]
B:BD[7.1706538] → [13.3354:3422]
∅:D[13.3422] → [8.9917:9919]
B:BD[8.9917] → [8.9917:9919]
B:BD[8.9919] → [4.8099:8140]
∅:D[15.7681] → [16.5012:5036]
∅:D[4.8140] → [16.5012:5036]
B:BD[8.9965] → [16.5012:5036]
∅:D[16.5036] → [8.9987:10037]
B:BD[8.9987] → [8.9987:10037]
∅:D[8.10038] → [17.2550:2618]
B:BD[7.1706538] → [17.2550:2618]
∅:D[17.2618] → [7.1706607:1706675]
B:BD[7.1706607] → [7.1706607:1706675]
B:BD[7.1706675] → [13.3423:3492]
∅:D[18.3372] → [7.1706748:1706750]
∅:D[13.3492] → [7.1706748:1706750]
B:BD[7.1706748] → [7.1706748:1706750]
B:BD[7.1706750] → [19.11631:11670]
B:BD[19.11670] → [5.2805:2864]
∅:D[20.1463] → [7.1707132:1707138]
∅:D[21.10386] → [7.1707132:1707138]
B:BD[7.1707132] → [7.1707132:1707138]
B:BD[7.1707260] → [7.1707260:1707310]
```
}
bool mon_can_see_monster(const monsters *mon, const monsters *targ)
{
    if (!mon->mon_see_cell(targ->pos()))
        return (false);
    return (mons_monster_visible(mon, targ));
}
// This does NOT do line of sight!  It checks the targ's visibility
// with respect to mon's perception, but doesn't do walls or range.
bool mons_monster_visible(const monsters *mon, const monsters *targ)
{
    if (targ->has_ench(ENCH_SUBMERGED)
        || targ->invisible() && !mon->can_see_invisible())
    {
        return (false);
    }
    return (true);
```

Replacement in crawl-ref/source/mon-util.cc at line 7974 [7.1699344]

B:BD[22.808] → [22.808:832]

B:BD[22.832] → [2.2666:2689]

∅:D[2.2689] → [22.886:986]

B:BD[22.886] → [22.886:986]

B:BD[22.986] → [18.3606:3675]

B:BD[18.3675] → [3.2701:2702]

∅:D[3.2702] → [22.1044:1098]

∅:D[18.3675] → [22.1044:1098]

B:BD[22.1044] → [22.1044:1098]

    if (this == looker)
        return (true);
    if (looker->atype() == ACT_PLAYER)
        return player_monster_visible(this);
    else
    {
        const monsters* mon = dynamic_cast<const monsters*>(looker);
        return mons_monster_visible(mon, this);
    }

[22.808]

[22.1098]

    bool vis = !invisible() || looker->can_see_invisible();
    return (vis && (this == looker || !has_ench(ENCH_SUBMERGED)));