fiddlerwoaroof/crawl - Change 3EMUQNNO6WWZMRVSRDRYPLQS2B6GYNTQSWAPY6BWY365XWZZV5XAC

debug_item_scan() and debug_mons_scan() should report an error, rather than

crash, when encountering an out-of-bounds monster or an invalid monster/item index. (A crash will soon happen anyways, but this prevents the crash reporter from recursively crashing when it calls the scan functions).

Make debug_mons_scan() give the index of the monsters it's reporting on.

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

Created by zelgadis on January 26, 2009

3EMUQNNO6WWZMRVSRDRYPLQS2B6GYNTQSWAPY6BWY365XWZZV5XAC

Dependencies

In channels

main

Change contents

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

[4.4052119]

[5.3577]

                if (obj < 0 || obj > MAX_ITEMS)
                {
                    if (igrd[x][y] == obj)
                        mprf(MSGCH_ERROR, "Igrd has invalid item index %d "
                                          "at (%d, %d)",
                             obj, x, y);
                    else
                        mprf(MSGCH_ERROR, "Item in stack at (%d, %d) has ",
                                          "invalid link %d",
                             x, y, obj);
                    break;
                }

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

∅:D[6.11299] → [7.24728:24765]

B:BD[4.4053914] → [7.24728:24765]

B:BD[7.24765] → [8.100460:100529]

            mprf("igrd(%d,%d) = %d",
                 mitm[i].pos.x, mitm[i].pos.y, igrd( mitm[i].pos ));

[6.11299]

[4.4054076]

            if (!in_bounds(mitm[i].pos))
                mprf(MSGCH_ERROR, "Item position (%d, %d) is out of bounds",
                     mitm[i].pos.x, mitm[i].pos.y);
            else
                mprf("igrd(%d,%d) = %d",
                     mitm[i].pos.x, mitm[i].pos.y, igrd( mitm[i].pos ));

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

[9.4920]

                continue;
            if (invalid_monster_index(mons))
            {
                mprf(MSGCH_ERROR, "mgrd at (%d, %d) has invalid monster "
                                  "index %d",
                     x, y, mons);

Insertion in crawl-ref/source/debug.cc at line 2412 [4.4016436]
[9.4946]
[2.3859]
```
            }
```

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

∅:D[2.4142] → [10.3044:3077]

B:BD[10.3044] → [10.3044:3077]

        if (mgrd(m->pos()) != i)

[2.4142]

[10.3077]

        coord_def pos = m->pos();
        if (!in_bounds(pos))
            mprf(MSGCH_ERROR, "Out of bounds monster: %s at (%d, %d), "
                              "midx = %d",
                 m->full_name(DESC_PLAIN, true).c_str(),
                 pos.x, pos.y, i);
        else if (mgrd(pos) != i)

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

∅:D[9.5646] → [10.3087:3151]

B:BD[10.3087] → [10.3087:3151]

            mprf(MSGCH_WARN, "Floating monster: %s at (%d,%d)",

[9.5646]

[11.8249]

            mprf(MSGCH_WARN, "Floating monster: %s at (%d,%d), midx = %d",

Replacement in crawl-ref/source/debug.cc at line 2467 [4.4016436]
B:BD[11.8306] → [11.8306:8348]
```
                 m->pos().x, m->pos().y);
```
[11.8306]
[10.3210]
```
                 pos.x, pos.y, i);
```

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

[12.2857]

                std::string full = m2->full_name(DESC_PLAIN, true);

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

∅:D[12.2908] → [13.2824:2885]

B:BD[13.2824] → [13.2824:2885]

B:BD[13.2885] → [12.2909:2958]

B:BD[12.2958] → [11.8349:8416]

                    mprf(MSGCH_WARN, "Also at (%d, %d): %s",
                         m->pos().x, m->pos().y,
                         m2->full_name(DESC_PLAIN, true).c_str());

[12.2908]

[12.3020]

                    mprf(MSGCH_WARN, "Also at (%d, %d): %s, midx = %d",
                         pos.x, pos.y, full.c_str(), j);

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

B:BD[12.3097] → [12.3097:3216]

B:BD[12.3216] → [11.8417:8484]

                    mprf(MSGCH_WARN, "Dead mon also at (%d, %d): %s",
                         m->pos().x, m->pos().y,
                         m2->full_name(DESC_PLAIN, true).c_str());

[12.3097]

[12.3278]

                    mprf(MSGCH_WARN, "Dead mon also at (%d, %d): %s,"
                                     "midx = %d",
                         pos.x, pos.y, full.c_str(), j);

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

[11.8699]

            if (idx < 0 || idx > MAX_ITEMS)
            {
                mprf(MSGCH_ERROR, "Monster %s (%d, %d) has invalid item "
                                  "index %d in slot %d.",
                     m->full_name(DESC_PLAIN, true).c_str(),
                     pos.x, pos.y, idx, j);
                continue;
            }

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

B:BD[11.8948] → [11.8948:8993]

                                 "slot %d.",

[11.8948]

[11.8993]

                                 "slot %d (midx = %d)",

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

B:BD[11.9054] → [11.9054:9103]

                     m->pos().x, m->pos().y, j);

[11.9054]

[11.9103]

                     pos.x, pos.y, j, i);

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

B:BD[11.9391] → [11.9391:9433]

                                 "item.",

[11.9391]

[11.9433]

                                 "item (midx = %d)",

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

B:BD[11.9494] → [11.9494:9540]

                     m->pos().x, m->pos().y);

[11.9494]

[11.9540]

                     pos.x, pos.y, i);

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

B:BD[11.9814] → [11.9814:9891]

B:BD[11.9891] → [3.3675:3747]

∅:D[3.3747] → [11.9964:10009]

B:BD[11.9964] → [11.9964:10009]

                mprf(MSGCH_WARN, "Monster %s (%d, %d) holding item %s, but "
                                 "item thinks it's held by monster %s "
                                 "(%d, %d)",

[11.9814]

[11.10009]

                mprf(MSGCH_WARN, "Monster %s (%d, %d) [midx = %d] holding "
                                 "item %s, but item thinks it's held by "
                                 "monster %s (%d, %d) [midx = %d]",

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

B:BD[11.10070] → [11.10070:10115]

                     m->pos().x, m->pos().y,

[11.10070]

[11.10115]

                     m->pos().x, m->pos().y, i,

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

B:BD[11.10181] → [11.10181:10237]

                     holder->pos().x, holder->pos().y);

[11.10181]

[11.10237]

                     holder->pos().x, holder->pos().y, holder->mindex());