fiddlerwoaroof/crawl - Change 3TEB6EUUYKQ4S6WJHX46OXUM4JPDSGJJNGACT7K7IBZU3L2SVJQAC

If debug_mons_scan() detects a problem which happened during level generation,

and there's vaults on the level, then report which vaults (if any) the problem monsters are in.

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

Created by zelgadis on December 29, 2008

3TEB6EUUYKQ4S6WJHX46OXUM4JPDSGJJNGACT7K7IBZU3L2SVJQAC

Dependencies

In channels

main

Change contents

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

B:BD[3.3853] → [3.3853:3922]

            mpr_comma_separated_list("Level_Vaults: ", vault_names);

[3.3853]

[3.3922]

            mpr_comma_separated_list("Level_Vaults: ", vault_names,
                                     " and ", ", ", MSGCH_WARN);

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

∅:D[2.2772] → [3.4112:4180]

B:BD[3.4112] → [3.4112:4180]

            mpr_comma_separated_list("Temp_Vaults: ", vault_names);

[2.2772]

[5.4873]

            mpr_comma_separated_list("Temp_Vaults: ", vault_names,
                                     " and ", ", ", MSGCH_WARN);
    }
}
static bool _inside_vault(const vault_placement& place, const coord_def &pos)
{
    const coord_def delta = pos - place.pos;
    return (delta.x >= 0 && delta.y >= 0
            && delta.x < place.size.x && delta.y < place.size.y);
}
static std::vector<std::string> _in_vaults(const coord_def &pos)
{
    std::vector<std::string> out;
    for (unsigned int i = 0; i < Level_Vaults.size(); i++)
    {
        const vault_placement &vault = Level_Vaults[i];
        if (_inside_vault(vault, pos))
            out.push_back(vault.map.name);

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

[5.4879]


    for (unsigned int i = 0; i < Temp_Vaults.size(); i++)
    {
        const vault_placement &vault = Temp_Vaults[i];
        if (_inside_vault(vault, pos))
            out.push_back(vault.map.name);
    }
    return (out);

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

[6.3544]

[7.2697]

    std::vector<coord_def> bogus_pos;
    std::vector<int>       bogus_idx;

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

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

B:BD[5.4991] → [5.4991:5036]

            if (m->pos() != coord_def(x, y))

[5.4991]

[6.3759]

            const coord_def pos(x, y);
            if (m->pos() != pos)

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

[6.3773]

[5.5037]

                bogus_pos.push_back(pos);
                bogus_idx.push_back(mons);

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

[7.2909]


    std::vector<int> floating_mons;
    bool             is_floating[MAX_MONSTERS];

Insertion in crawl-ref/source/debug.cc at line 2370 [4.4016436]
[7.2959]
[7.2959]
```
        is_floating[i] = false;
```
Insertion in crawl-ref/source/debug.cc at line 2375 [4.4016436]
[7.3044]
[7.3044]

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

[7.3087]

[5.5604]

            floating_mons.push_back(i);
            is_floating[i] = true;

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

B:BD[5.5648] → [5.5648:5684]

    if (warned && Generating_Level)

[5.5648]

[5.5684]

    // No problems?
    if (!warned)
        return;
    // If this wasn't the result of generating a level then there's nothing
    // more to report.
    if (!Generating_Level)
    {
        // Force the dev to notice problems. :P
        more();
        return;
    }
    // No vaults to report on?
    if (Level_Vaults.size() == 0 && Temp_Vaults.size() == 0)
    {

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

[5.5753]

        // Force the dev to notice problems. :P
        more();
        return;
    }
    mpr("");
    for (unsigned int i = 0; i < floating_mons.size(); i++)
    {
        const int       idx = floating_mons[i];
        const monsters* mon = &menv[idx];
        std::vector<std::string> vaults = _in_vaults(mon->pos());
        std::string str =
            make_stringf("Floating monster %s (%d, %d)",
                         mon->name(DESC_PLAIN, true).c_str(),
                         mon->pos().x, mon->pos().y);

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

∅:D[5.5754] → [7.3244:3334]

B:BD[7.3244] → [7.3244:3334]

    // If there are warnings, force the dev to notice. :P
    if (warned)
        more();

[5.5754]

[8.1681]

        if (vaults.size() == 0)
            mprf(MSGCH_WARN, "%s not in any vaults.", str.c_str());
        else
            mpr_comma_separated_list(str + " in vault(s) ", vaults,
                                     " and ", ", ", MSGCH_WARN);
    }
    mpr("");
    for (unsigned int i = 0; i < bogus_pos.size(); i++)
    {
        const coord_def pos = bogus_pos[i];
        const int       idx = bogus_idx[i];
        const monsters* mon = &menv[idx];
        std::string str =
            make_stringf("Bogus mgrd (%d, %d) pointing to %s",
                         pos.x, pos.y, mon->name(DESC_PLAIN, true).c_str());
        std::vector<std::string> vaults = _in_vaults(pos);
        if (vaults.size() == 0)
            mprf(MSGCH_WARN, "%s not in any vaults.", str.c_str());
        else
            mpr_comma_separated_list(str + " in vault(s) ", vaults,
                                     " and ", ", ", MSGCH_WARN);
        // Don't report on same monster twice.
        if (is_floating[idx])
            continue;
        str    = "Monster pointed to";
        vaults = _in_vaults(mon->pos());
        if (vaults.size() == 0)
            mprf(MSGCH_WARN, "%s not in any vaults.", str.c_str());
        else
            mpr_comma_separated_list(str + " in vault(s) ", vaults,
                                     " and ", ", ", MSGCH_WARN);
    }
    mpr("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!", MSGCH_ERROR);
    // Force the dev to notice problems. :P
    more();