fiddlerwoaroof/crawl - Change CKUQML2VZN6MF7U72JIFOU4LELG4H2E4NRZDOZYDGCWNPHFLOTEQC

Improve handling of god gifts when dumping gods, so that only god gifts

granted to you by that god are affected.

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

Created by dolorous on June 13, 2008

CKUQML2VZN6MF7U72JIFOU4LELG4H2E4NRZDOZYDGCWNPHFLOTEQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/religion.cc at line 511 [8.804403]
[6.829]
[7.923]
```
        god_acting gdact(god, true);
```

Replacement in crawl-ref/source/religion.cc at line 827 [8.804403]

B:BD[5.2738] → [5.2738:2810]

            && mon->attitude == ATT_FRIENDLY && mons_is_god_gift(mon));

[5.2738]

[5.2810]

            && mons_friendly(mon) && mons_is_god_gift(mon, GOD_BEOGH));

Insertion in crawl-ref/source/religion.cc at line 4043 [8.804403]

[9.3393]

    const god_type god =
        (crawl_state.is_god_acting()) ? crawl_state.which_god_acting()
                                      : GOD_NO_GOD;

Replacement in crawl-ref/source/religion.cc at line 4051 [8.804403]
B:BD[9.3501] → [4.2529:2558]
∅:D[4.2558] → [9.3533:3582]
B:BD[9.3533] → [9.3533:3582]
```
        if (monster->alive()
            && monster->attitude == ATT_FRIENDLY
```
[9.3501]
[9.3582]
```
        if (is_follower(monster)
```
Replacement in crawl-ref/source/religion.cc at line 4053 [8.804403]
B:BD[9.3625] → [10.12555:12597]
```
            && mons_is_god_gift(monster))
```
[9.3625]
[9.3678]
```
            && mons_is_god_gift(monster, god))
```

Insertion in crawl-ref/source/religion.cc at line 4087 [8.804403]

[11.2842]

    const god_type god =
        (crawl_state.is_god_acting()) ? crawl_state.which_god_acting()
                                      : GOD_NO_GOD;

Replacement in crawl-ref/source/religion.cc at line 4095 [8.804403]

B:BD[11.2950] → [4.2559:2588]

        if (monster->alive()

[11.2950]

[12.2708]

        if (is_follower(monster)
            && !monster->has_ench(ENCH_CHARM)

Replacement in crawl-ref/source/religion.cc at line 4098 [8.804403]
∅:D[12.2745] → [11.2982:3031]
B:BD[11.2982] → [11.2982:3031]
B:BD[11.3031] → [10.12598:12640]
```
            && monster->attitude == ATT_FRIENDLY
            && mons_is_god_gift(monster))
```
[12.2745]
[11.3078]
```
            && mons_is_god_gift(monster, god))
```

Insertion in crawl-ref/source/religion.cc at line 4132 [8.804403]

[9.4536]

    const god_type god =
        (crawl_state.is_god_acting()) ? crawl_state.which_god_acting()
                                      : GOD_NO_GOD;

Replacement in crawl-ref/source/religion.cc at line 4140 [8.804403]

B:BD[9.4644] → [4.2589:2618]

∅:D[4.2618] → [9.4676:4725]

B:BD[9.4676] → [9.4676:4725]

B:BD[9.4725] → [10.12641:12683]

        if (monster->alive()
            && monster->attitude == ATT_FRIENDLY
            && mons_is_god_gift(monster))

[9.4644]

[9.4772]

        if (is_follower(monster)
            && mons_is_god_gift(monster, god))

Insertion in crawl-ref/source/religion.cc at line 4145 [8.804403]
[9.4867]
[13.2630]
```
            monster->del_ench(ENCH_CHARM, true);
```

Insertion in crawl-ref/source/religion.cc at line 4249 [8.804403]

[14.3604]

                            monster->del_ench(ENCH_CHARM, true);

Insertion in crawl-ref/source/religion.cc at line 4595 [8.804403]
[3.4069]
[12.3684]
```
            god_acting good_gdact(GOD_SHINING_ONE, true);
```
Insertion in crawl-ref/source/religion.cc at line 4608 [8.804403]
[3.4109]
[12.3873]
```
            god_acting good_gdact(GOD_SHINING_ONE, true);
```
Replacement in crawl-ref/source/mon-util.h at line 641 [8.1682293]
B:BD[15.6082] → [10.13868:13912]
```
bool mons_is_god_gift(const monsters *mon);
```
[15.6082]
[2.5478]
```
bool mons_is_god_gift(const monsters *mon, god_type god = you.religion);
```
Replacement in crawl-ref/source/mon-util.cc at line 493 [8.1699344]
B:BD[16.470176] → [10.13914:13957]
```
bool mons_is_god_gift(const monsters *mon)
```
[16.470176]
[10.13957]
```
bool mons_is_god_gift(const monsters *mon, god_type god)
```

Replacement in crawl-ref/source/mon-util.cc at line 495 [8.1699344]

B:BD[10.13959] → [10.13959:13996]

    return (mon->god != GOD_NO_GOD);

[10.13959]

[10.13996]

    if (god == GOD_NO_GOD)
        return (false);
    return (mon->god == god);

Improve handling of god gifts when dumping gods, so that only god gifts

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/religion.cc at line 511 [8.804403]

Replacement in crawl-ref/source/religion.cc at line 827 [8.804403]

Insertion in crawl-ref/source/religion.cc at line 4043 [8.804403]

Replacement in crawl-ref/source/religion.cc at line 4051 [8.804403]

Replacement in crawl-ref/source/religion.cc at line 4053 [8.804403]

Insertion in crawl-ref/source/religion.cc at line 4087 [8.804403]

Replacement in crawl-ref/source/religion.cc at line 4095 [8.804403]

Replacement in crawl-ref/source/religion.cc at line 4098 [8.804403]

Insertion in crawl-ref/source/religion.cc at line 4132 [8.804403]

Replacement in crawl-ref/source/religion.cc at line 4140 [8.804403]

Insertion in crawl-ref/source/religion.cc at line 4145 [8.804403]

Insertion in crawl-ref/source/religion.cc at line 4249 [8.804403]

Insertion in crawl-ref/source/religion.cc at line 4595 [8.804403]

Insertion in crawl-ref/source/religion.cc at line 4608 [8.804403]

Replacement in crawl-ref/source/mon-util.h at line 641 [8.1682293]

Replacement in crawl-ref/source/mon-util.cc at line 493 [8.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 495 [8.1699344]