fiddlerwoaroof/crawl - Change AJD2Y3VP6VETRNNNSVVZ6JTN7LZUET6EEX6UDR3WLFLB7CB5SMQAC

Fixed possible crash when placing monster bands. Also reworked the mapgen stats to give more detailed information.

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

Created by dshaligram on September 28, 2007

AJD2Y3VP6VETRNNNSVVZ6JTN7LZUET6EEX6UDR3WLFLB7CB5SMQAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/monplace.cc at line 632 [3.1641732]

B:BD[2.17807] → [2.17807:17849]

        menv[id].flags |= MF_BAND_MEMBER;

[2.17807]

[3.1652110]

        if (id != -1 && id != NON_MONSTER)
            menv[id].flags |= MF_BAND_MEMBER;

Insertion in crawl-ref/source/debug.cc at line 3027 [3.4016436]

[4.820]


typedef std::map< std::string, std::set<level_id> > mapname_place_map;
static mapname_place_map mapgen_map_levelsused;

Insertion in crawl-ref/source/debug.cc at line 3066 [3.4016436]

[5.1857]


        you.uniq_map_tags.clear();
        you.uniq_map_names.clear();

Replacement in crawl-ref/source/debug.cc at line 3093 [3.4016436]

B:BD[6.3236] → [5.2001:2045]

            if (!mg_do_build_level(niters))

[6.3236]

[5.2045]

            int iters = niters;
            if (branch == BRANCH_MAIN_DUNGEON && depth == 1)
                iters *= 10;
            if (!mg_do_build_level(iters))

Insertion in crawl-ref/source/debug.cc at line 3111 [3.4016436]
[7.9266]
[8.47796]
```
    you.level_type_name = "bazaar";
```
Insertion in crawl-ref/source/debug.cc at line 3126 [3.4016436]
[4.1032]
[6.4174]
```
    mapgen_map_levelsused[map.name].insert(level_id::current());
```

Replacement in crawl-ref/source/debug.cc at line 3236 [3.4016436]

B:BD[4.1523] → [4.1523:1589]

            make_stringf("%-10s: ", i->first.describe().c_str());

[4.1523]

[4.1589]

            make_stringf("%s ------------\n", i->first.describe().c_str());

Deletion in crawl-ref/source/debug.cc at line 3238 [3.4016436]
B:BD[4.1644] → [4.1644:1677]
```
        bool unfinished = false;
```

Replacement in crawl-ref/source/debug.cc at line 3243 [3.4016436]

B:BD[4.1856] → [4.1856:1916]

            line += *j;
            if (line.length() > 79)

[4.1856]

[4.1916]

            if (line.length() + j->length() > 79)

Replacement in crawl-ref/source/debug.cc at line 3245 [3.4016436]

B:BD[4.1930] → [4.1930:1988]

                unfinished = true;
                break;

[4.1930]

[4.1988]

                fprintf(outf, "%s\n", line.c_str());
                line = *j;

Insertion in crawl-ref/source/debug.cc at line 3248 [3.4016436]
[4.2002]
[4.2002]
```
            else
                line += *j;
```

Replacement in crawl-ref/source/debug.cc at line 3252 [3.4016436]

B:BD[4.2013] → [4.2013:2218]

        const unsigned margin = unfinished? 74 : 79;
        if (line.length() > margin)
            line = line.substr(0, margin);
        fprintf(outf, "%s%s\n", line.c_str(), unfinished? ", ..." : "");

[4.2013]

[6.5596]

        if (!line.empty())
            fprintf(outf, "%s\n", line.c_str());
        fprintf(outf, "------------\n\n");

Insertion in crawl-ref/source/debug.cc at line 3276 [3.4016436]

[6.6441]


    fprintf(outf, "\n\nMaps and where used:\n\n");
    for (mapname_place_map::iterator i = mapgen_map_levelsused.begin();
         i != mapgen_map_levelsused.end(); ++i)
    {
        fprintf(outf, "%s ============\n", i->first.c_str());
        std::string line;
        for (std::set<level_id>::const_iterator j = i->second.begin();
             j != i->second.end(); ++j)
        {
            if (!line.empty())
                line += ", ";
            std::string level = j->describe();
            if (line.length() + level.length() > 79)
            {
                fprintf(outf, "%s\n", line.c_str());
                line = level;
            }
            else
                line += level;
        }
        if (!line.empty())
            fprintf(outf, "%s\n", line.c_str());
        fprintf(outf, "==================\n\n");
    }