fiddlerwoaroof/crawl - Change K7EIE5VJDKRYBAZRDFEEEKST2P2B7HFPH2AJVER5JUUQVTYXZWHQC

Make handling of undead versus demonic abominations consistent.

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

Created by dolorous on October 3, 2008

K7EIE5VJDKRYBAZRDFEEEKST2P2B7HFPH2AJVER5JUUQVTYXZWHQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/spells3.cc at line 1109 [4.531613]

[3.2656]

[3.2818]

    // Mark this abomination as undead.
    menv[monster].flags |= MF_HONORARY_UNDEAD;

Deletion in crawl-ref/source/mon-util.cc at line 362 [4.1699344]
B:BD[5.257] → [6.5770:5859]
∅:D[6.5859] → [7.2713:2769]
B:BD[5.345] → [7.2713:2769]
∅:D[7.2769] → [5.400:402]
B:BD[5.400] → [5.400:402]
B:BD[5.402] → [2.2597:2758]
∅:D[5.679] → [4.1703982:1703985]
∅:D[2.2758] → [4.1703982:1703985]
B:BD[4.1703982] → [4.1703982:1703985]
```
// Returns true if a given monster is an abomination created by
// Twisted Resurrection.
static bool _mons_your_abomination(const monsters *mon)
{
    return ((mon->type == MONS_ABOMINATION_SMALL
             || mon->type == MONS_ABOMINATION_LARGE)
            && testbits(mon->flags, MF_CREATED_FRIENDLY));
}
```
Replacement in crawl-ref/source/mon-util.cc at line 364 [4.1699344]
B:BD[8.469699] → [7.2770:2807]
```
    if (_mons_your_abomination(mon))
```
[8.469699]
[5.716]
```
    if (testbits(mon->flags, MF_HONORARY_UNDEAD))
```

Replacement in crawl-ref/source/enum.h at line 1977 [4.3287960]

B:BD[9.15416] → [9.15416:15496]

    MF_GOT_HALF_XP        = 0x4000  // Player already got half xp value earlier

[9.15416]

[4.3342202]

    MF_GOT_HALF_XP        = 0x4000, // Player already got half xp value earlier
    MF_HONORARY_UNDEAD    = 0x8000  // Consider this monster to have MH_UNDEAD
                                    // holiness, regardless of its actual type;
                                    // currently used for abominations created
                                    // via Twisted Resurrection