fiddlerwoaroof/crawl - Change TN2D3PHU7VSGUND2BDIC2F4U6O2HFSV3JXLF7HMYYMY7GZXM6IFAC

Clean up the holy being neutralization code. The MF_CONVERT_ATTEMPT

flag is now MF_ATT_CHANGE_ATTEMPT, since it's used to change holy beings' attitudes to either neutral or hostile, as well as to change orcs' attitudes to friendly.

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

Created by dolorous on February 7, 2008

TN2D3PHU7VSGUND2BDIC2F4U6O2HFSV3JXLF7HMYYMY7GZXM6IFAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/view.cc at line 755 [4.16817]

B:BD[3.382] → [3.382:432]

        && !(monster->flags & MF_CONVERT_ATTEMPT)

[3.382]

[3.432]

        && !(monster->flags & MF_ATT_CHANGE_ATTEMPT)

Replacement in crawl-ref/source/view.cc at line 763 [4.16817]

B:BD[3.702] → [3.702:748]

        monster->flags |= MF_CONVERT_ATTEMPT;

[3.702]

[5.45]

        monster->flags |= MF_ATT_CHANGE_ATTEMPT;

Replacement in crawl-ref/source/view.cc at line 784 [4.16817]

B:BD[3.1432] → [3.1432:1587]

             && (monster->attitude == ATT_NEUTRAL
             || monster->attitude == ATT_FRIENDLY)
             && (monster->flags & MF_CONVERT_ATTEMPT)

[3.1432]

[3.1587]

             && monster->attitude != ATT_HOSTILE
             && (monster->flags & MF_ATT_CHANGE_ATTEMPT)

Replacement in crawl-ref/source/view.cc at line 815 [4.16817]

B:BD[5.408] → [6.290:340]

        && !(monster->flags & MF_CONVERT_ATTEMPT)

[5.408]

[6.340]

        && !(monster->flags & MF_ATT_CHANGE_ATTEMPT)

Replacement in crawl-ref/source/view.cc at line 822 [4.16817]

B:BD[5.554] → [5.554:600]

        monster->flags |= MF_CONVERT_ATTEMPT;

[5.554]

[5.600]

        monster->flags |= MF_ATT_CHANGE_ATTEMPT;

Replacement in crawl-ref/source/view.cc at line 848 [4.16817]

B:BD[5.3650] → [5.3650:3704]

             && (monster->flags & MF_CONVERT_ATTEMPT)

[5.3650]

[5.3704]

             && (monster->flags & MF_ATT_CHANGE_ATTEMPT)

Replacement in crawl-ref/source/religion.cc at line 363 [4.804403]
B:BD[4.806513] → [3.4955:4992]
```
static bool holy_beings_reconvert();
```
[4.806513]
[7.2525]
```
static bool holy_beings_attitude_change();
```

Replacement in crawl-ref/source/religion.cc at line 411 [4.804403]

B:BD[3.5171] → [3.5171:5212]

                holy_beings_reconvert();

[3.5171]

[3.5212]

                holy_beings_attitude_change();

Replacement in crawl-ref/source/religion.cc at line 1804 [4.804403]

B:BD[3.5377] → [3.5377:5418]

                holy_beings_reconvert();

[3.5377]

[4.848729]

                holy_beings_attitude_change();

Replacement in crawl-ref/source/religion.cc at line 1819 [4.804403]
B:BD[2.2828] → [2.2828:2865]
```
            holy_beings_reconvert();
```
[2.2828]
[2.2865]
```
            holy_beings_attitude_change();
```
Replacement in crawl-ref/source/religion.cc at line 2719 [4.804403]
B:BD[3.5465] → [3.5465:5510]
```
static bool holy_beings_on_level_reconvert()
```
[3.5465]
[3.5510]
```
static bool holy_beings_on_level_attitude_change()
```

Replacement in crawl-ref/source/religion.cc at line 2727 [4.804403]

B:BD[3.5660] → [3.5660:5722]

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

[3.5660]

[3.5722]

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

Replacement in crawl-ref/source/religion.cc at line 2731 [4.804403]

B:BD[3.5757] → [3.5757:5836]

            mprf(MSGCH_DIAGNOSTICS, "Reconverting: %s on level %d, branch %d",

[3.5757]

[3.5836]

            mprf(MSGCH_DIAGNOSTICS, "Attitude changing: %s on level %d, branch %d",

Replacement in crawl-ref/source/religion.cc at line 2741 [4.804403]

B:BD[3.6176] → [3.6176:6291]

                if ((monster->flags & MF_CONVERT_ATTEMPT)
                    && monster->attitude == ATT_HOSTILE)

[3.6176]

[3.6291]

                if (monster->attitude == ATT_HOSTILE)

Replacement in crawl-ref/source/religion.cc at line 2743 [4.804403]

B:BD[3.6309] → [3.6309:6368]

                    monster->flags &= ~MF_CONVERT_ATTEMPT;

[3.6309]

[3.6368]

                    monster->flags &= ~MF_ATT_CHANGE_ATTEMPT;

Replacement in crawl-ref/source/religion.cc at line 2749 [4.804403]

B:BD[3.6438] → [3.6438:6551]

            // If you worship an exil god, you make all neutral and
            // friendly holy beings hostile.

[3.6438]

[3.6551]

            // If you worship an evil god, you make all non-hostile holy
            // beings hostile.

Replacement in crawl-ref/source/religion.cc at line 2753 [4.804403]

B:BD[3.6608] → [3.6608:6719]

                if (monster->attitude == ATT_NEUTRAL ||
                    monster->attitude == ATT_FRIENDLY)

[3.6608]

[3.6719]

                if (monster->attitude != ATT_HOSTILE)

Replacement in crawl-ref/source/religion.cc at line 2768 [4.804403]
B:BD[3.7007] → [3.7007:7043]
```
static bool holy_beings_reconvert()
```
[3.7007]
[3.7043]
```
static bool holy_beings_attitude_change()
```

Replacement in crawl-ref/source/religion.cc at line 2770 [4.804403]

B:BD[3.7045] → [3.7045:7111]

    return apply_to_all_dungeons(holy_beings_on_level_reconvert);

[3.7045]

[8.20262]

    return apply_to_all_dungeons(holy_beings_on_level_attitude_change);

Replacement in crawl-ref/source/religion.cc at line 2783 [4.804403]

B:BD[7.2924] → [7.2924:2978]

            && (monster->flags & MF_CONVERT_ATTEMPT))

[7.2924]

[7.2978]

            && (monster->flags & MF_ATT_CHANGE_ATTEMPT))

Replacement in crawl-ref/source/religion.cc at line 2837 [4.804403]

B:BD[7.4441] → [7.4441:4507]

                        && (monster->flags & MF_CONVERT_ATTEMPT))

[7.4441]

[9.2665]

                        && (monster->flags & MF_ATT_CHANGE_ATTEMPT))

Insertion in crawl-ref/source/religion.cc at line 3082 [4.804403]
[3.8431]
[3.8431]
```
    holy->flags |= MF_GOD_GIFT;
```

Replacement in crawl-ref/source/religion.cc at line 3738 [4.804403]

B:BD[3.8588] → [3.8588:8645]

        // all neutral and friendly holy beings hostile.

[3.8588]

[3.8645]

        // all non-hostile holy beings hostile.

Replacement in crawl-ref/source/religion.cc at line 3742 [4.804403]
B:BD[3.8762] → [3.8762:8803]
```
            if (holy_beings_reconvert())
```
[3.8762]
[3.8803]
```
            if (holy_beings_attitude_change())
```

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

B:BD[10.34211] → [3.9072:9141]

∅:D[3.9141] → [10.34291:34339]

B:BD[10.34291] → [10.34291:34339]

    MF_CONVERT_ATTEMPT    = 0x800,  // Seen player and was converted
                                    // (or not)

[10.34211]

[10.34339]

    MF_ATT_CHANGE_ATTEMPT = 0x800,  // Saw player and attitude changed (or
                                    // not); currently used for holy beings
                                    // (good god worshippers -> neutral)
                                    // and orcs (Beogh worshippers -> friendly)