fiddlerwoaroof/crawl - Change KIAIGHATPEOUGEWQXS2IR4635E53WPEENC5UJ3I3MASTJ7SHBU5AC

Forward-port 0.5 r10272 to trunk (except that Dissolution actually gets

the Slime God as its god), and add a few minor cleanups.

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

Created by dolorous on July 18, 2009

KIAIGHATPEOUGEWQXS2IR4635E53WPEENC5UJ3I3MASTJ7SHBU5AC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/view.cc at line 978 [3.16817]
B:BD[2.548] → [2.548:549]
Replacement in crawl-ref/source/religion.cc at line 198 [3.804403]
B:BD[2.5120] → [2.5120:5154]
```
        " dissolve% into ooze .",
```
[2.5120]
[2.5154]
```
        " dissolve% into ooze.",
```
Deletion in crawl-ref/source/monstuff.cc at line 5584 [3.1396662]
∅:D[4.3203] → [5.12074:12084]
B:BD[5.12074] → [5.12074:12084]
```
        {
```
Replacement in crawl-ref/source/monstuff.cc at line 5585 [3.1396662]
B:BD[5.12103] → [5.12103:12113]
```
        }
```
[5.12103]
[6.422858]

Insertion in crawl-ref/source/monplace.cc at line 1062 [3.1641732]

[7.3849]

        case MONS_JELLY:
            menv[id].god = GOD_JIYVA;
            break;

Replacement in crawl-ref/source/mon-util.cc at line 631 [3.1699344]
B:BD[2.24018] → [2.24018:24061]
```
// Monsters consider as "slime" for Jiyva.
```
[2.24018]
[2.24061]
```
// Monsters considered as "slime" for Jiyva.
```

Replacement in crawl-ref/source/mon-util.cc at line 634 [3.1699344]

B:BD[2.24103] → [2.24103:24318]

    if (mons_genus(mon->type) == MONS_JELLY
        || mons_genus(mon->type) == MONS_GIANT_EYEBALL
        || mons_genus(mon->type) == MONS_GIANT_ORANGE_BRAIN)
    {
        return (true);
    }
    return (false);

[2.24103]

[2.24318]

    return (mons_genus(mon->type) == MONS_JELLY
            || mons_genus(mon->type) == MONS_GIANT_EYEBALL
            || mons_genus(mon->type) == MONS_GIANT_ORANGE_BRAIN);

Replacement in crawl-ref/source/mon-data.h at line 4013 [3.1826214]
B:BD[8.4820] → [8.4820:4840]
```
        | M_SPEAKS,
```
[8.4820]
[8.4840]
```
        | M_PRIEST | M_SPEAKS,
```
Deletion in crawl-ref/source/effects.cc at line 3469 [3.3382105]
B:BD[2.27367] → [2.27367:27388]
```
        int created;
```

Forward-port 0.5 r10272 to trunk (except that Dissolution actually gets

Dependencies

In channels

Change contents

Deletion in crawl-ref/source/view.cc at line 978 [3.16817]

Replacement in crawl-ref/source/religion.cc at line 198 [3.804403]

Deletion in crawl-ref/source/monstuff.cc at line 5584 [3.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 5585 [3.1396662]

Insertion in crawl-ref/source/monplace.cc at line 1062 [3.1641732]

Replacement in crawl-ref/source/mon-util.cc at line 631 [3.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 634 [3.1699344]

Replacement in crawl-ref/source/mon-data.h at line 4013 [3.1826214]

Deletion in crawl-ref/source/effects.cc at line 3469 [3.3382105]