fiddlerwoaroof/crawl - Change GN3X2AI373HZRX53EQEWSILYEAMKBJBN4NKW5CT7PHYKPEWOPX4AC

Possible fix for bug 2293518: if a monster tries to unsubmerge while there's

already a different monster on the same square, then treat it like a monster trying to unsubmerge from underneath the player. Also give an error message (with a reference to the bug number) since two monsters aren't supposed to be on the same square.

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

Created by zelgadis on November 22, 2008

GN3X2AI373HZRX53EQEWSILYEAMKBJBN4NKW5CT7PHYKPEWOPX4AC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/mon-util.cc at line 5690 [6.1699344]
[4.2667]
[5.3996]
```
    int midx = monster_index(mon);
```

Replacement in crawl-ref/source/mon-util.cc at line 5693 [6.1699344]

B:BD[5.3997] → [4.2668:2701]

    if (mon->pos() != you.pos())

[5.3997]

[4.2701]

    if (mgrd(mon->pos()) == NON_MONSTER)
        mgrd(mon->pos()) = midx;
    if (mon->pos() != you.pos() && midx == mgrd(mon->pos()))

Replacement in crawl-ref/source/mon-util.cc at line 5699 [6.1699344]

B:BD[5.4053] → [5.4053:4191]

B:BD[5.4191] → [2.4085:4127]

    // Monster un-submerging while under player.  Try to move to an
    // adjacent square in which the monster could have been submerged
    // and have it unsubmerge from there.

[5.4053]

[7.56432]

    if (midx != mgrd(mon->pos()))
    {
        monsters* other_mon = &menv[mgrd(mon->pos())];
        if (other_mon->type == -1 || other_mon->type == NON_MONSTER)
        {
            mgrd(mon->pos()) = midx;
            mprf(MSGCH_ERROR, "mgrd(%d,%d) points to dead monster, even "
                 "though it contains submerged monster %s (see bug 2293518)",
                 mon->pos().x, mon->pos().y,
                 mon->name(DESC_PLAIN, true).c_str());
            if (mon->pos() != you.pos())
                return (true);
        }
        else
            mprf(MSGCH_ERROR, "%s tried to unsubmerge while on same square as "
                 "%s (see bug 2293518)", mon->name(DESC_CAP_THE, true).c_str(),
                 mon->name(DESC_NOCAP_A, true).c_str());
    }
    // Monster un-submerging while under player or another monster.  Try to
    // move to an adjacent square in which the monster could have been
    // submerged and have it unsubmerge from there.

Replacement in crawl-ref/source/mon-util.cc at line 5728 [6.1699344]

B:BD[7.56505] → [3.5672:5748]

        if (mgrd(*ai) == NON_MONSTER && monster_can_submerge(mon, grd(*ai))

[7.56505]

[3.5748]

        if (mgrd(*ai) == NON_MONSTER && *ai != you.pos()
            && monster_can_submerge(mon, grd(*ai))