fiddlerwoaroof/crawl - Change QNQHEILZ3S365ZANMX6PDT3IDMMSXHXRDVWI4HEBA5AMSOIRMQIAC

Simplify checks for Xom demons.

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

Created by dolorous on March 19, 2008

QNQHEILZ3S365ZANMX6PDT3IDMMSXHXRDVWI4HEBA5AMSOIRMQIAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/xom.cc at line 428 [5.3]

B:BD[4.356] → [4.356:416]

        roll >= 340 ? DEMON_COMMON  :
        DEMON_LESSER;

[4.356]

[6.1574]

        roll >= 340 ? DEMON_COMMON
                    : DEMON_LESSER;

Replacement in crawl-ref/source/xom.cc at line 507 [5.3]

B:BD[6.1814] → [7.425:479]

            const bool is_demon = mons_is_demon(mon);

[6.1814]

            const bool is_demonic = (mons_class_holiness(mon) == MH_DEMONIC);

Replacement in crawl-ref/source/xom.cc at line 511 [5.3]
B:BD[6.1929] → [7.480:507]
```
            if (!is_demon)
```
[6.1929]
[6.1966]
```
            if (!is_demonic)
```

Insertion in crawl-ref/source/xom.cc at line 526 [5.3]

[2.513]

[7.842]

                    const bool is_demonic = (mons_holiness(mon) == MH_DEMONIC);

Replacement in crawl-ref/source/xom.cc at line 529 [5.3]

B:BD[2.575] → [2.575:721]

                    if ((mons_is_demon(mon->type) && hostiletype == 1)
                        || (!mons_is_demon(mon->type) && hostiletype == 2)

[2.575]

[2.721]

                    if ((is_demonic && hostiletype == 1)
                        || (!is_demonic && hostiletype == 2)

Replacement in crawl-ref/source/xom.cc at line 533 [5.3]

B:BD[2.788] → [2.788:845]

                            mon->attitude = ATT_HOSTILE;

[2.788]

[2.845]

                        mon->attitude = ATT_HOSTILE;

Insertion in crawl-ref/source/xom.cc at line 574 [5.3]

[6.2540]

        const bool is_demonic = (mons_class_holiness(mon) == MH_DEMONIC);

Replacement in crawl-ref/source/xom.cc at line 577 [5.3]

B:BD[3.651] → [3.651:689]

∅:D[3.689] → [6.2647:2680]

B:BD[6.2647] → [6.2647:2680]

        // different messages below./
        if (!mons_is_demon(mon))

[3.651]

[6.2680]

        // different messages below.
        if (is_demonic)

Insertion in crawl-ref/source/xom.cc at line 651 [5.3]

[8.872]

        const bool is_demonic = (mons_class_holiness(mon) == MH_DEMONIC);

Replacement in crawl-ref/source/xom.cc at line 655 [5.3]
B:BD[8.979] → [8.979:1012]
```
        if (!mons_is_demon(mon))
```
[8.979]
[8.1012]
```
        if (is_demonic)
```