fiddlerwoaroof/crawl - Change BFY6SHZ6LMQGROWAMAUFJT2IMHEQGI42V2PVVFN2AMZ2YKOUE6OQC

Xom-forced spells shouldn't trigger penance. [2509398]

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

Created by haranp on January 27, 2009

BFY6SHZ6LMQGROWAMAUFJT2IMHEQGI42V2PVVFN2AMZ2YKOUE6OQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spl-cast.cc at line 799 [4.293070]

B:BD[4.311998] → [5.3339:3380]

    if (!_spell_is_utility_spell(spell))

[4.311998]

[6.265]

    // If you are casting while a god is acting, then don't do conducts.
    // (Presumably Xom is forcing you to cast a spell.)
    if (!_spell_is_utility_spell(spell) && !crawl_state.is_god_acting())

Replacement in crawl-ref/source/spl-cast.cc at line 809 [4.293070]

∅:D[3.423] → [7.161:211]

B:BD[8.233] → [7.161:211]

    if (_spell_is_unholy(spell) && !you.banished)

[3.423]

[2.557]

    if (_spell_is_unholy(spell)
        && !you.banished
        && !crawl_state.is_god_acting())
    {

Insertion in crawl-ref/source/spl-cast.cc at line 814 [4.293070]
[2.624]
[9.128509]
```
    }
```

Replacement in crawl-ref/source/spl-cast.cc at line 821 [4.293070]

B:BD[9.128753] → [8.403:453]

    if (spell_typematch(spell, SPTYP_NECROMANCY))

[9.128753]

[9.128804]

    if (spell_typematch(spell, SPTYP_NECROMANCY)
        && !crawl_state.is_god_acting())