fiddlerwoaroof/crawl - Change IB4IOXRL7AMMYTUE7GKYDYI6FE5ZFDIUG7DXAZIRMNEPA7KVSSWQC

Some more attempts to prevent/catch/diagnose floating monster problems. Among

other things:

If level generation leaves some monsters detached then this will be specifically noted.
If applying _handle_monster_move() to a monster causes that monster to become detached it will be noted (those it won't catch other monster being detached by that monster moving).

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

Created by zelgadis on December 29, 2008

IB4IOXRL7AMMYTUE7GKYDYI6FE5ZFDIUG7DXAZIRMNEPA7KVSSWQC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/monstuff.cc at line 1975 [4.1396662]
B:BD[4.1428890] → [5.22452:22492]
```
    mgrd(monster->pos()) = NON_MONSTER;
```
Replacement in crawl-ref/source/monstuff.cc at line 1976 [4.1396662]
B:BD[4.1428932] → [4.1428932:1428933]
B:BD[4.1428933] → [6.43519:43546]
∅:D[6.43546] → [5.22601:22642]
B:BD[5.22601] → [5.22601:22642]
```
    monster->moveto(near);
    mgrd(near) = monster_index(monster);
```
[7.4027]
[8.420257]
```
    if (!monster->move_to_pos(near))
        return (false);
```

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

[9.3399]


    if (mgrd(loc) != NON_MONSTER)
    {
        mpr("Something prevents you from swapping places.");
        return (false);
    }

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

[3.8483]

                    if (mgrd(oldpos) != NON_MONSTER)
                    {
                        mprf("Something prevents you from swapping places "
                             "with %s.",
                             mon->name(DESC_NOCAP_THE).c_str());
                        return (do_resist);
                    }

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

[10.1354]

[11.4453]


#if DEBUG_MONS_SCAN
    bool monster_was_floating = mgrd(monster->pos()) != monster->mindex();
#endif

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

[4.1507744]

[10.1355]

#if DEBUG_MONS_SCAN
        if (!monster_was_floating
            && mgrd(monster->pos()) != monster->mindex())
        {
            mprf(MSGCH_ERROR, "Monster %s became detached from mgrd "
                              "in _handle_monster_move() loop",
                 monster->name(DESC_PLAIN, true).c_str());
            mpr("[[[[[[[[[[[[[[[[[[", MSGCH_WARN);
            debug_mons_scan();
            mpr("]]]]]]]]]]]]]]]]]]", MSGCH_WARN);
            monster_was_floating = true;
        }
        else if (monster_was_floating
                 && mgrd(monster->pos()) == monster->mindex())
        {
            mprf(MSGCH_DIAGNOSTICS, "Monster %s re-attached itself to mgrd "
                                    "in _handle_monster_move() loop",
                 monster->name(DESC_PLAIN, true).c_str());
            monster_was_floating = false;
        }
#endif

Insertion in crawl-ref/source/monplace.cc at line 977 [4.1641732]
[4.1654209]
[4.1654209]
```
    ASSERT(mgrd(fpos) == NON_MONSTER);
```
Insertion in crawl-ref/source/mon-util.cc at line 4919 [4.1699344]
[12.9868]
[13.1480]
```
    if (type == -1)
        return ("INVALID MONSTER");
```
Insertion in crawl-ref/source/mon-util.cc at line 5286 [4.1699344]
[6.56097]
[6.56097]
```
    ASSERT(mgrd(c) == NON_MONSTER || c == pos());
```

Insertion in crawl-ref/source/dungeon.cc at line 316 [4.3429798]

[14.13146]

[15.1773]


#if DEBUG_MONS_SCAN
            // If debug_mons_scan() find a problem while Generating_Level is
            // still true then it will announce that a problem was caused
            // during level generation.
            debug_mons_scan();
#endif

Insertion in crawl-ref/source/debug.cc at line 2256 [4.4016436]

[16.3519]

static void _announce_level_prob(bool warned)
{
    if (!warned && Generating_Level)
    {
        mpr("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!", MSGCH_ERROR);
        mpr("mgrd problem occurred during level generation", MSGCH_ERROR);
    }
}

Replacement in crawl-ref/source/debug.cc at line 2272 [4.4016436]

B:BD[16.3667] → [16.3667:3759]

            if (mons != NON_MONSTER &&
                menv[mons].pos() != coord_def(x, y))

[16.3667]

[16.3759]

            if (mons == NON_MONSTER)
                continue;
            const monsters *m = &menv[mons];
            if (m->pos() != coord_def(x, y))

Replacement in crawl-ref/source/debug.cc at line 2277 [4.4016436]

B:BD[16.3773] → [16.3773:3822]

                const monsters *m = &menv[mons];

[16.3773]

[17.2723]

                _announce_level_prob(warned);

Replacement in crawl-ref/source/debug.cc at line 2279 [4.4016436]

B:BD[17.2756] → [17.2756:2866]

                     "Bogosity: mgrd at %d,%d points at %s, "
                     "but monster is at %d,%d",

[17.2756]

[2.2595]

                     "Bogosity: mgrd at (%d,%d) points at %s, "
                     "but monster is at (%d,%d)",

Insertion in crawl-ref/source/debug.cc at line 2283 [4.4016436]

[2.2703]

[17.2867]

                if (!m->alive())
                    mpr("Additionally, it isn't alive.", MSGCH_WARN);
                warned = true;
            }
            else if (!m->alive())
            {
                _announce_level_prob(warned);
                mprf(MSGCH_WARN,
                     "mgrd at (%d,%d) points at dead monster %s",
                     x, y, m->name(DESC_PLAIN, true).c_str());

Insertion in crawl-ref/source/debug.cc at line 2304 [4.4016436]
[17.3087]
[17.3087]
```
            _announce_level_prob(warned);
```

Insertion in crawl-ref/source/debug.cc at line 2333 [4.4016436]

[17.3244]


    if (warned && Generating_Level)
        mpr("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!", MSGCH_ERROR);