fiddlerwoaroof/crawl - Change KHYL5UOMGS7HLVEQNVIOYWNP2ZH2THKZ5CGGIZFI6NN5V2YD3YEAC

Add follower-related cleanups.

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

Created by dolorous on June 13, 2008

KHYL5UOMGS7HLVEQNVIOYWNP2ZH2THKZ5CGGIZFI6NN5V2YD3YEAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/religion.h at line 105 [6.800304]

[4.2593]

[5.2522]

bool is_orcish_follower(const monsters* mon);
bool is_good_lawful_follower(const monsters* mon);

Deletion in crawl-ref/source/religion.h at line 108 [6.800304]
∅:D[7.2554] → [4.2593:2639]
∅:D[5.2566] → [4.2593:2639]
∅:D[8.2577] → [4.2593:2639]
∅:D[9.2602] → [4.2593:2639]
∅:D[10.2615] → [4.2593:2639]
B:BD[4.2593] → [4.2593:2639]
```
bool is_orcish_follower(const monsters* mon);
```

Replacement in crawl-ref/source/religion.cc at line 822 [6.804403]

B:BD[11.2725] → [5.2568:2611]

bool is_good_follower(const monsters* mon)

[11.2725]

[11.2767]

bool is_orcish_follower(const monsters* mon)
{
    return (mon->alive() && mons_species(mon->type) == MONS_ORC
            && mon->attitude == ATT_FRIENDLY && mons_is_god_gift(mon));
}
bool is_good_lawful_follower(const monsters* mon)

Replacement in crawl-ref/source/religion.cc at line 831 [6.804403]

B:BD[8.2722] → [2.2675:2711]

            && mons_friendly(mon));

[12.2580]

[11.2964]

            && !mons_is_chaotic(mon) && mons_friendly(mon));

Replacement in crawl-ref/source/religion.cc at line 834 [6.804403]
B:BD[11.2967] → [11.2967:3012]
```
bool is_orcish_follower(const monsters* mon)
```
[11.2967]
[11.3012]
```
bool is_good_follower(const monsters* mon)
```

Replacement in crawl-ref/source/religion.cc at line 836 [6.804403]

B:BD[11.3014] → [11.3014:3078]

B:BD[11.3078] → [3.11472:11544]

    return (mon->alive() && mons_species(mon->type) == MONS_ORC
            && mon->attitude == ATT_FRIENDLY && mons_is_god_gift(mon));

[11.3014]

[13.2898]

    return (mon->alive() && !mons_is_evil_or_unholy(mon)
            && mons_friendly(mon));

Replacement in crawl-ref/source/religion.cc at line 842 [6.804403]
B:BD[11.3201] → [5.2612:2685]
∅:D[8.2806] → [5.2685:2725]
B:BD[5.2685] → [5.2685:2725]
```
    if (is_good_god(you.religion))
        return is_good_follower(mon);
    else if (you.religion == GOD_BEOGH)
```
[11.3201]
[5.2725]
```
    if (you.religion == GOD_BEOGH)
```

Insertion in crawl-ref/source/religion.cc at line 844 [6.804403]

[5.2765]

    else if (you.religion == GOD_ZIN)
        return is_good_lawful_follower(mon);
    else if (is_good_god(you.religion))
        return is_good_follower(mon);