fiddlerwoaroof/crawl - Change KVBY4K2MCJZXNFVJZPKTYUXRXPH5LE6ZOJW4LTHOZPO6TD555IVQC

Consolidate the checks for gods that give you permanent followers into a

function, and have it take the other good gods into account, since, if you switch from TSO to another good god, you keep all your non-daeva permanent followers.

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

Created by dolorous on June 14, 2008

KVBY4K2MCJZXNFVJZPKTYUXRXPH5LE6ZOJW4LTHOZPO6TD555IVQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/religion.h at line 59 [5.800304]
[4.1020]
[2.2527]
```
bool god_gives_permanent_followers(god_type god);
```

Insertion in crawl-ref/source/religion.cc at line 456 [5.804403]

[6.185]

[7.29343]

bool god_gives_permanent_followers(god_type god)
{
    // Only TSO and Beogh do this, but if you switch from TSO to another
    // good god, you keep your (non-daeva) permanent followers, so count
    // the other good gods here as well.
    return (is_good_god(god)
            || god == GOD_BEOGH);
}

Replacement in crawl-ref/source/religion.cc at line 5203 [5.804403]

B:BD[8.3825] → [3.3926:3996]

    if (you.religion == GOD_BEOGH || you.religion == GOD_SHINING_ONE)

[8.3825]

[3.3996]

    if (god_gives_permanent_followers(you.religion))

Replacement in crawl-ref/source/religion.cc at line 5205 [5.804403]

B:BD[3.4002] → [3.4002:4104]

        // With these two, you can get permanent followers, so enable
        // ally pickup control.

[3.4002]

[3.4104]

        // Enable ally pickup control for gods that give you permanent
        // followers.

Replacement in crawl-ref/source/religion.cc at line 5211 [5.804403]

B:BD[3.4188] → [3.4188:4353]

        // With other gods you can only get stupid (zombies!), summoned
        // or charmed allies, so pickup control makes no sense.
        // Sorry about that!

[3.4188]

[3.4353]

        // With other gods, you can only get stupid (zombies!),
        // summoned, or charmed allies, so pickup control makes no
        // sense.  Sorry about that!

Replacement in crawl-ref/source/monstuff.cc at line 412 [5.1396662]

B:BD[9.3454] → [10.3463:3540]

            if (you.religion != GOD_SHINING_ONE && you.religion != GOD_BEOGH

[9.3454]

[10.3540]

            if (!god_gives_permanent_followers(you.religion)

Replacement in crawl-ref/source/misc.cc at line 2060 [5.1933596]

B:BD[11.5157] → [3.5881:5955]

        if (you.religion == GOD_BEOGH || you.religion == GOD_SHINING_ONE)

[11.5157]

[3.5955]

        if (god_gives_permanent_followers(you.religion))

Replacement in crawl-ref/source/acr.cc at line 1955 [5.4397395]

B:BD[12.5603] → [3.10989:11063]

        if (you.religion != GOD_SHINING_ONE && you.religion != GOD_BEOGH)

[12.5603]

[3.11063]

        if (!god_gives_permanent_followers(you.religion))

Replacement in crawl-ref/source/acr.cc at line 4064 [5.4397395]

B:BD[3.11591] → [3.11591:11665]

        if (you.religion == GOD_BEOGH || you.religion == GOD_SHINING_ONE)

[3.11591]

[3.11665]

        if (god_gives_permanent_followers(you.religion))