fiddlerwoaroof/crawl - Change C67GX7W5HBCDPQJRSHWMLM4DUJ3ELFSHH42SVICFJVCJW25T5Z3AC

Fire resistant monsters drown in lava instead of being incinerated.

Used correct check to see if monsters can drown. Monsters quaffing healing are also cured of confusion and rotting now (Erik).

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

Created by dshaligram on April 3, 2007

C67GX7W5HBCDPQJRSHWMLM4DUJ3ELFSHH42SVICFJVCJW25T5Z3AC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/monstuff.cc at line 2436 [4.1396662]

[3.632]

[4.1480326]

                    monster->del_ench(ENCH_CONFUSION);
                    monster->del_ench(ENCH_ROT);

Replacement in crawl-ref/source/monstuff.cc at line 4244 [4.1396662]
B:BD[5.4355] → [5.4355:4394]
```
    const int grid = grd(mons->pos());
```
[5.4355]
[6.133]
```
    int grid = grd(mons->pos());
```

Insertion in crawl-ref/source/monstuff.cc at line 4257 [4.1396662]

[5.4794]

[7.73]

        if (grid == DNGN_LAVA && mons_res_fire(mons) > 0)
            grid = DNGN_DEEP_WATER;

Replacement in crawl-ref/source/monstuff.cc at line 4262 [4.1396662]

B:BD[7.175] → [8.2205:2269]

        if (grid == DNGN_LAVA || mons->holiness() != MH_UNDEAD)

[7.175]

[5.4899]

        if (grid == DNGN_LAVA || mons->can_drown())

Insertion in crawl-ref/source/mon-util.cc at line 2480 [4.1699344]
[9.8492]
[9.8492]
```
bool monsters::can_drown() const
{
    return (!mons_res_asphyx(this));
}
```
Replacement in crawl-ref/source/fight.cc at line 2770 [4.3140790]
B:BD[10.74134] → [10.74134:74164]
```
            mprf("%s %s %s!",
```
[10.74134]
[10.74164]
```
            mprf("%s %s %s%s",
```

Replacement in crawl-ref/source/fight.cc at line 2773 [4.3140790]

B:BD[10.74274] → [10.74274:74332]

                 defender->name(DESC_NOCAP_THE).c_str());

[10.74274]

[2.443]

                 defender->name(DESC_NOCAP_THE).c_str(),
                 special_attack_punctuation().c_str());

Insertion in crawl-ref/source/externs.h at line 946 [4.3270163]
[9.83690]
[9.83690]
```
    bool      can_drown() const;
```