fiddlerwoaroof/crawl - Change Z3E3EG25UDOX2TT2OLEGHF76PA3WVNU72I5SL43BXMFYOZ25Y7OQC

Move player_see_invis into player class.

Created by Robert Vollmert on October 22, 2009

Z3E3EG25UDOX2TT2OLEGHF76PA3WVNU72I5SL43BXMFYOZ25Y7OQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/view.cc at line 896 [9.16817]

B:BD[7.62] → [8.6:64]

    if (!player_see_invis() && mons->has_ench(ENCH_INVIS)

[7.62]

[2.8]

    if (!you.can_see_invisible() && mons->has_ench(ENCH_INVIS)

Replacement in crawl-ref/source/view.cc at line 1175 [9.16817]

B:BD[10.243] → [10.243:320]

    if (mons_near(monster) && (!monster->invisible() || player_see_invis()))

[10.243]

[11.3700]

    if (mons_near(monster) && (!monster->invisible() || you.can_see_invisible()))

Replacement in crawl-ref/source/spells4.cc at line 349 [9.436250]
B:BD[9.447826] → [9.447826:447854]
```
    if (player_see_invis())
```
[9.447826]
[9.447854]
```
    if (you.can_see_invisible())
```
Replacement in crawl-ref/source/spells4.cc at line 1181 [9.436250]
∅:D[12.21936] → [13.355:401]
B:BD[13.355] → [13.355:401]
```
    beem.can_see_invis  = player_see_invis();
```
[12.21936]
[13.401]
```
    beem.can_see_invis  = you.can_see_invisible();
```

Replacement in crawl-ref/source/spells3.cc at line 1293 [9.531613]

∅:D[14.3232] → [15.1619:1683]

B:BD[15.1619] → [15.1619:1683]

        if ((chance == 3 || chance == 8) && player_see_invis())

[14.3232]

[5.939]

        if ((chance == 3 || chance == 8) && you.can_see_invisible())

Replacement in crawl-ref/source/spells2.cc at line 554 [9.569242]
B:BD[9.590538] → [9.590538:590579]
```
            else if (player_see_invis())
```
[9.590538]
[9.590579]
```
            else if (you.can_see_invisible())
```

Replacement in crawl-ref/source/spells1.cc at line 604 [9.616635]

B:BD[16.406] → [16.406:459]

        beem.can_see_invis     = player_see_invis();

[16.406]

[16.459]

        beem.can_see_invis     = you.can_see_invisible();

Insertion in crawl-ref/source/player.h at line 303 [9.945993]
[6.11689]
[6.11689]
```
    bool can_see_invisible(bool unid) const;
```
Deletion in crawl-ref/source/player.h at line 764 [9.945993]
B:BD[9.956487] → [17.2355:2400]
```
int player_see_invis(bool calc_unid = true);
```
Deletion in crawl-ref/source/player.cc at line 2703 [9.962854]
B:BD[9.1002564] → [3.3967:3969]
∅:D[3.3969] → [9.1002625:1002626]
B:BD[9.1002625] → [9.1002625:1002626]
B:BD[9.1002626] → [17.2683:2720]
∅:D[17.2720] → [9.1002663:1002665]
∅:D[18.199944] → [9.1002663:1002665]
B:BD[9.1002663] → [9.1002663:1002665]
B:BD[9.1002665] → [17.2721:2737]
∅:D[17.2737] → [9.1002691:1002692]
∅:D[19.3718] → [9.1002691:1002692]
B:BD[9.1002691] → [9.1002691:1002692]
B:BD[9.1002692] → [18.199945:200012]
∅:D[18.200012] → [9.1002748:1002749]
B:BD[9.1002748] → [9.1002748:1002749]
B:BD[9.1002749] → [20.3056:3097]
∅:D[20.3097] → [9.1002793:1002861]
B:BD[9.1002793] → [9.1002793:1002861]
B:BD[9.1002861] → [21.10410:10518]
∅:D[21.10518] → [9.1003075:1003173]
B:BD[9.1003075] → [9.1003075:1003173]
B:BD[9.1003173] → [20.3098:3118]
B:BD[20.3118] → [22.21278:21340]
∅:D[22.21340] → [9.1003245:1003295]
∅:D[18.200073] → [9.1003245:1003295]
B:BD[9.1003245] → [9.1003245:1003295]
B:BD[9.1003295] → [23.7511:7527]
∅:D[23.7527] → [24.106:123]
B:BD[24.106] → [24.106:123]
B:BD[24.123] → [23.7528:7545]
```
}
int player_see_invis(bool calc_unid)
{
    int si = 0;
    si += player_equip( EQ_RINGS, RING_SEE_INVISIBLE, calc_unid );
    // armour: (checks head armour only)
    si += player_equip_ego_type( EQ_HELMET, SPARM_SEE_INVISIBLE );
    if (player_mutation_level(MUT_ACUTE_VISION) > 0)
        si += player_mutation_level(MUT_ACUTE_VISION);
    //jmf: added see_invisible spell
    if (you.duration[DUR_SEE_INVISIBLE] > 0)
        si++;
    // randart wpns
    int artefacts = scan_artefacts(ARTP_EYESIGHT, calc_unid);
    if (artefacts > 0)
        si += artefacts;
    if (si > 1)
        si = 1;
    return (si);
```
Replacement in crawl-ref/source/player.cc at line 2710 [9.962854]
B:BD[9.1003585] → [25.2613:2662]
```
    if (!player_see_invis() && mon->invisible())
```
[9.1003585]
[9.1003706]
```
    if (!you.can_see_invisible() && mon->invisible())
```

Insertion in crawl-ref/source/player.cc at line 7316 [9.962854]

[26.33145]

[27.184]

}
bool player::can_see_invisible(bool calc_unid) const
{
    int si = 0;
    si += player_equip( EQ_RINGS, RING_SEE_INVISIBLE, calc_unid );
    // armour: (checks head armour only)
    si += player_equip_ego_type( EQ_HELMET, SPARM_SEE_INVISIBLE );
    if (player_mutation_level(MUT_ACUTE_VISION) > 0)
        si += player_mutation_level(MUT_ACUTE_VISION);
    //jmf: added see_invisible spell
    if (you.duration[DUR_SEE_INVISIBLE] > 0)
        si++;
    // randart wpns
    int artefacts = scan_artefacts(ARTP_EYESIGHT, calc_unid);
    if (artefacts > 0)
        si += artefacts;
    if (si > 1)
        si = 1;
    return (si);

Replacement in crawl-ref/source/player.cc at line 7348 [9.962854]
B:BD[27.228] → [27.228:265]
```
    return (player_see_invis() > 0);
```
[27.228]
[28.317]
```
    return (can_see_invisible(true));
```
Replacement in crawl-ref/source/output.cc at line 2164 [9.1088282]
B:BD[29.58435] → [29.58435:58486]
```
    const int rinvi = player_see_invis(calc_unid);
```
[29.58435]
[4.4143]
```
    const int rinvi = you.can_see_invisible(calc_unid);
```

Replacement in crawl-ref/source/monstuff.cc at line 2216 [9.1396662]

B:BD[30.11372] → [30.11372:11453]

    bool can_see_new = !mons_class_flag(targetc, M_INVIS) || player_see_invis();

[30.11372]

[30.11453]

    bool can_see_new = !mons_class_flag(targetc, M_INVIS) || you.can_see_invisible();

Replacement in crawl-ref/source/monstuff.cc at line 6693 [9.1396662]

B:BD[31.11120] → [31.11120:11189]

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

[31.11120]

[31.11189]

            && (!mons_friendly(monster) || you.can_see_invisible(false)))

Replacement in crawl-ref/source/mon-util.cc at line 3137 [9.1699344]

B:BD[32.3833] → [33.5874:5937]

            || mons_friendly(mon) && !player_see_invis(false))

[32.3833]

[32.3898]

            || mons_friendly(mon) && !you.can_see_invisible(false))

Replacement in crawl-ref/source/mon-util.cc at line 7037 [9.1699344]
∅:D[34.2790] → [35.2691:2747]
B:BD[36.15906] → [35.2691:2747]
```
        else if (mons_near(this) && !player_see_invis()
```
[34.2790]
[34.2791]
```
        else if (mons_near(this) && !you.can_see_invisible()
```

Replacement in crawl-ref/source/mon-util.cc at line 8415 [9.1699344]

B:BD[37.3031] → [37.3031:3102]

                && (player_see_invis(false) || !mons_friendly(this)));

[37.3031]

[38.4877]

                && (you.can_see_invisible(false) || !mons_friendly(this)));

Replacement in crawl-ref/source/it_use2.cc at line 588 [9.2904329]
B:BD[9.2916915] → [9.2916915:2916948]
```
        if (!player_see_invis())
```
[9.2916915]
[9.2916948]
```
        if (!you.can_see_invisible())
```
Replacement in crawl-ref/source/ghost.cc at line 335 [41.9890]
B:BD[39.22383] → [40.4532:4573]
```
    see_invis      = player_see_invis();
```
[39.22383]
[40.4573]
```
    see_invis      = you.can_see_invisible();
```
Replacement in crawl-ref/source/decks.cc at line 2726 [9.3987460]
B:BD[42.21329] → [42.21329:21365]
```
           && !player_see_invis());
```
[42.21329]
[43.1110]
```
           && !you.can_see_invisible());
```
Replacement in crawl-ref/source/beam.cc at line 246 [9.4128068]
∅:D[12.103177] → [13.4173:4220]
B:BD[13.4173] → [13.4173:4220]
```
    pbolt.can_see_invis  = player_see_invis();
```
[12.103177]
[13.4220]
```
    pbolt.can_see_invis  = you.can_see_invisible();
```

Replacement in crawl-ref/source/acr.cc at line 2236 [9.4397395]

B:BD[9.4447556] → [44.3302:3375]

    if (_decrement_a_duration(DUR_SEE_INVISIBLE) && !player_see_invis())

[9.4447556]

[45.3202]

    if (_decrement_a_duration(DUR_SEE_INVISIBLE) && !you.can_see_invisible())

Move player_see_invis into player class.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/view.cc at line 896 [9.16817]

Replacement in crawl-ref/source/view.cc at line 1175 [9.16817]

Replacement in crawl-ref/source/spells4.cc at line 349 [9.436250]

Replacement in crawl-ref/source/spells4.cc at line 1181 [9.436250]

Replacement in crawl-ref/source/spells3.cc at line 1293 [9.531613]

Replacement in crawl-ref/source/spells2.cc at line 554 [9.569242]

Replacement in crawl-ref/source/spells1.cc at line 604 [9.616635]

Insertion in crawl-ref/source/player.h at line 303 [9.945993]

Deletion in crawl-ref/source/player.h at line 764 [9.945993]

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

Replacement in crawl-ref/source/player.cc at line 2710 [9.962854]

Insertion in crawl-ref/source/player.cc at line 7316 [9.962854]

Replacement in crawl-ref/source/player.cc at line 7348 [9.962854]

Replacement in crawl-ref/source/output.cc at line 2164 [9.1088282]

Replacement in crawl-ref/source/monstuff.cc at line 2216 [9.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 6693 [9.1396662]

Replacement in crawl-ref/source/mon-util.cc at line 3137 [9.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 7037 [9.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 8415 [9.1699344]

Replacement in crawl-ref/source/it_use2.cc at line 588 [9.2904329]

Replacement in crawl-ref/source/ghost.cc at line 335 [41.9890]

Replacement in crawl-ref/source/decks.cc at line 2726 [9.3987460]

Replacement in crawl-ref/source/beam.cc at line 246 [9.4128068]

Replacement in crawl-ref/source/acr.cc at line 2236 [9.4397395]