fiddlerwoaroof/crawl - Change OLMTUY4KVSPRWQKIOLSIYRAUEVJLRDJV7CCXJRW7IKWGUHSNRZTAC

Consolidate checks for the player's being undead or a demonspawn into

player_is_unholy(), a la mons_is_unholy(), and use it where possible.

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

Created by dolorous on January 17, 2009

OLMTUY4KVSPRWQKIOLSIYRAUEVJLRDJV7CCXJRW7IKWGUHSNRZTAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/view.cc at line 885 [6.16817]
B:BD[5.68] → [5.68:123]
```
    if (you.is_undead || you.species == SP_DEMONSPAWN)
```
[5.68]
[5.123]
```
    if (player_is_unholy())
```

Replacement in crawl-ref/source/spl-cast.cc at line 867 [6.293070]

B:BD[7.4694] → [2.697:800]

    if ((you.is_undead || you.species == SP_DEMONSPAWN)
        && spell_typematch(spell, SPTYP_HOLY))

[7.4694]

[7.4757]

    if (player_is_unholy() && spell_typematch(spell, SPTYP_HOLY))

Replacement in crawl-ref/source/spl-book.cc at line 1394 [6.397614]

B:BD[6.427440] → [2.854:961]

    if ((you.is_undead || you.species == SP_DEMONSPAWN)
        && spell_typematch(specspell, SPTYP_HOLY))

[6.427440]

[6.427505]

    if (player_is_unholy() && spell_typematch(specspell, SPTYP_HOLY))

Replacement in crawl-ref/source/religion.cc at line 6429 [6.804403]

B:BD[8.1820] → [9.3742:3860]

    const bool you_evil = (you.is_undead || you.species == SP_DEMONSPAWN);
    if (you_evil && is_good_god(which_god)

[8.1820]

[9.3860]

    if (player_is_unholy() && is_good_god(which_god)

Insertion in crawl-ref/source/player.h at line 180 [6.945993]
[10.5807]
[10.5807]
```
bool player_is_unholy();
```

Replacement in crawl-ref/source/player.cc at line 6345 [6.962854]

B:BD[11.9177] → [11.9177:9282]

        if (is_holy_item(item)
            && (you.is_undead || you.species == SP_DEMONSPAWN))
        {

[11.9177]

[11.9282]

        if (player_is_unholy() && is_holy_item(item))

Deletion in crawl-ref/source/player.cc at line 6347 [6.962854]
B:BD[11.9310] → [11.9310:9320]
```
        }
```

Insertion in crawl-ref/source/player.cc at line 6762 [6.962854]

[12.4594]

[10.11830]

}
bool player_is_unholy()
{
    const mon_holy_type holiness = you.holiness();
    return (holiness == MH_UNDEAD || holiness == MH_DEMONIC);

Replacement in crawl-ref/source/ouch.cc at line 223 [6.1104358]

B:BD[13.361781] → [4.2620:2684]

        else if (you.is_undead || you.species == SP_DEMONSPAWN)

[13.361781]

[14.2956]

        else if (player_is_unholy())

Deletion in crawl-ref/source/ouch.cc at line 230 [6.1104358]
B:BD[15.2997] → [15.2997:2998]

Replacement in crawl-ref/source/newgame.cc at line 4437 [6.1132300]

B:BD[16.25869] → [16.25869:25937]

        if (you.species == SP_MUMMY || you.species == SP_DEMONSPAWN

[16.25869]

[16.25937]

        if (you.species == SP_DEMONSPAWN || you.species == SP_MUMMY

Replacement in crawl-ref/source/itemprop.cc at line 2026 [13.646661]
∅:D[17.3305] → [13.695626:695686]
B:BD[13.695626] → [13.695626:695686]
```
        && (you.is_undead || you.species == SP_DEMONSPAWN))
```
[17.3305]
[13.695686]
```
        && player_is_unholy())
```
Replacement in crawl-ref/source/item_use.cc at line 147 [6.2781507]
∅:D[18.2591] → [19.364061:364117]
∅:D[13.731011] → [19.364061:364117]
B:BD[19.364061] → [19.364061:364117]
B:BD[19.364117] → [20.16257:16291]
```
    if ((you.is_undead || you.species == SP_DEMONSPAWN)
        && is_holy_item(*weapon))
```
[19.363824]
[13.731240]
```
    if (player_is_unholy() && is_holy_item(*weapon))
```
Replacement in crawl-ref/source/effects.cc at line 66 [6.3382105]
B:BD[21.6029] → [22.2765:2821]
```
    if (!you.is_undead && you.species != SP_DEMONSPAWN)
```
[21.6029]
[23.2805]
```
    if (!player_is_unholy())
```
Deletion in crawl-ref/source/beam.cc at line 2273 [6.4128068]
∅:D[13.1232004] → [6.4184224:4184225]
B:BD[6.4184224] → [6.4184224:4184225]
Deletion in crawl-ref/source/beam.cc at line 3256 [6.4128068]
∅:D[24.3327] → [25.6100:6158]
B:BD[25.6100] → [25.6100:6158]
```
    // Cleansing flame doesn't affect player's followers.
```

Replacement in crawl-ref/source/beam.cc at line 4362 [6.4128068]

B:BD[26.56511] → [27.2845:2910]

        behaviour_event( mon, ME_DISTURB, beam_source, source );

[26.56511]

[3.25699]

        behaviour_event(mon, ME_DISTURB, beam_source, source);

Replacement in crawl-ref/source/beam.cc at line 4387 [6.4128068]

B:BD[26.57139] → [3.25773:25839]

    if ( !determine_damage(mon, preac, postac, final, messages) )

[26.57139]

[26.57195]

    if (!determine_damage(mon, preac, postac, final, messages))

Consolidate checks for the player's being undead or a demonspawn into

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/view.cc at line 885 [6.16817]

Replacement in crawl-ref/source/spl-cast.cc at line 867 [6.293070]

Replacement in crawl-ref/source/spl-book.cc at line 1394 [6.397614]

Replacement in crawl-ref/source/religion.cc at line 6429 [6.804403]

Insertion in crawl-ref/source/player.h at line 180 [6.945993]

Replacement in crawl-ref/source/player.cc at line 6345 [6.962854]

Deletion in crawl-ref/source/player.cc at line 6347 [6.962854]

Insertion in crawl-ref/source/player.cc at line 6762 [6.962854]

Replacement in crawl-ref/source/ouch.cc at line 223 [6.1104358]

Deletion in crawl-ref/source/ouch.cc at line 230 [6.1104358]

Replacement in crawl-ref/source/newgame.cc at line 4437 [6.1132300]

Replacement in crawl-ref/source/itemprop.cc at line 2026 [13.646661]

Replacement in crawl-ref/source/item_use.cc at line 147 [6.2781507]

Replacement in crawl-ref/source/effects.cc at line 66 [6.3382105]

Deletion in crawl-ref/source/beam.cc at line 2273 [6.4128068]

Deletion in crawl-ref/source/beam.cc at line 3256 [6.4128068]

Replacement in crawl-ref/source/beam.cc at line 4362 [6.4128068]

Replacement in crawl-ref/source/beam.cc at line 4387 [6.4128068]