fiddlerwoaroof/crawl - Change 5DVMFDTDCWKGQ372J5WGN4FDYUQWZZV6NJKW4VDD4QLCPZET5L5QC

Handle one more case of Jiyva's altar removal.

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

Created by dolorous on July 19, 2009

5DVMFDTDCWKGQ372J5WGN4FDYUQWZZV6NJKW4VDD4QLCPZET5L5QC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/religion.h at line 106 [5.800304]
B:BD[4.2472] → [3.2944:2966]
```
bool jiyva_is_dead();
```
Insertion in crawl-ref/source/religion.h at line 108 [5.800304]
[2.2673]
[6.263]
```
bool jiyva_is_dead();
bool remove_all_jiyva_altars();
```

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

[3.3002]


            const bool dead_jiyva = (god == GOD_JIYVA && jiyva_is_dead());

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

B:BD[3.3086] → [3.3086:3218]

                             god == GOD_JIYVA && jiyva_is_dead() ?
                                 ", and vanishes" : "").c_str(),

[3.3086]

[3.3218]

                             dead_jiyva ? ", and vanishes" : "").c_str(),

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

[3.3241]

[7.45]

            if (dead_jiyva)
                remove_all_jiyva_altars();

Deletion in crawl-ref/source/religion.cc at line 935 [5.804403]
∅:D[8.3091] → [9.2866:2869]
∅:D[10.39025] → [9.2866:2869]
B:BD[9.2866] → [9.2866:2869]
B:BD[9.2869] → [3.3242:3368]
```
}
bool jiyva_is_dead()
{
    return (you.royal_jelly_dead
            && you.religion != GOD_JIYVA && !you.penance[GOD_JIYVA]);
```

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

[11.3686]

[12.6285]

}
bool jiyva_is_dead()
{
    return (you.royal_jelly_dead
            && you.religion != GOD_JIYVA && !you.penance[GOD_JIYVA]);
}
static bool _remove_jiyva_altars()
{
    bool success = false;
    for (rectangle_iterator ri(1); ri; ++ri)
    {
        if (grd(*ri) == DNGN_ALTAR_JIYVA)
        {
            grd(*ri) = DNGN_FLOOR;
            success = true;
        }
    }
    return (success);

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

[12.6288]

[8.3092]

bool remove_all_jiyva_altars()
{
    return (apply_to_all_dungeons(_remove_jiyva_altars));
}

Deletion in crawl-ref/source/monstuff.cc at line 764 [5.1396662]

B:BD[12.19260] → [12.19260:19528]

∅:D[12.19528] → [13.3624:3626]

B:BD[13.3624] → [13.3624:3626]

B:BD[13.3626] → [3.4258:4259]

static bool _remove_jiyva_altars()
{
    bool success = false;
    for (rectangle_iterator ri(1); ri; ++ri)
    {
        if (grd(*ri) == DNGN_ALTAR_JIYVA)
        {
            grd(*ri) = DNGN_FLOOR;
            success = true;
        }
    }
    return (success);
}

Replacement in crawl-ref/source/monstuff.cc at line 812 [5.1396662]
B:BD[14.3041] → [14.3041:3090]
```
    apply_to_all_dungeons(_remove_jiyva_altars);
```
[14.3041]
[15.7851]
```
    remove_all_jiyva_altars();
```