fiddlerwoaroof/crawl - Change GUUCEQSUVRDD6GIOYCMFPHMS7YORWLZQBVM4CSOXD6GD5F4OMTIAC

Clean up handling of neutralized holy beings and converted orcs. Now

that god gift handling has been generalized, they shouldn't get the "god gift" flag anymore.

This also fixes an inconsistency that can occur if an orcish follower was converted using the Crusade card; Beogh would object to your attacking it, but it wouldn't abandon you if you abandoned Beogh.

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

Created by dolorous on March 10, 2008

GUUCEQSUVRDD6GIOYCMFPHMS7YORWLZQBVM4CSOXD6GD5F4OMTIAC

Dependencies

In channels

main

Change contents

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

B:BD[5.5660] → [6.3125:3186]

B:BD[6.3186] → [2.2517:2564]

            && mons_class_holiness(monster->type) == MH_HOLY
            && (monster->flags & MF_GOD_GIFT))

[5.5660]

[5.5722]

            && mons_class_holiness(monster->type) == MH_HOLY)

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

B:BD[8.3625] → [8.3625:3678]

            && testbits(monster->flags,MF_GOD_GIFT))

[8.3625]

[8.3678]

            && (monster->flags & MF_GOD_GIFT))

Deletion in crawl-ref/source/religion.cc at line 2858 [7.804403]
B:BD[8.3688] → [8.3688:3689]

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

B:BD[9.2875] → [9.2875:2924]

B:BD[9.2924] → [2.2684:2731]

            && monster->attitude == ATT_FRIENDLY
            && (monster->flags & MF_GOD_GIFT))

[9.2875]

[9.2978]

            && monster->attitude == ATT_FRIENDLY)

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

∅:D[4.2713] → [6.3851:3883]

B:BD[5.8431] → [6.3851:3883]

    holy->flags |= MF_GOD_GIFT;

[4.2713]

[3.3161]

    // not really *created* neutral, but should it become
    // hostile later on, it won't count as a good kill

Deletion in crawl-ref/source/religion.cc at line 3260 [7.804403]
B:BD[10.3046] → [10.3046:3077]
```
    orc->flags |= MF_GOD_GIFT;
```