fiddlerwoaroof/crawl - Change ECJNCUSSE63BKED3EAYIXQCI62I76QGNHCSFO3CDWPRZF3JQP44QC

Tweak map stat output, fixed a couple of bugs.

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

Created by dshaligram on July 8, 2007

ECJNCUSSE63BKED3EAYIXQCI62I76QGNHCSFO3CDWPRZF3JQP44QC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/maps.cc at line 83 [4.2007666]

B:BD[3.4618] → [2.299:536]

    const int result = write_vault( vdefs[which_vault], vgrid, place, avoid );
#ifdef DEBUG_DIAGNOSTICS
    if (crawl_state.map_stat_gen && result > 0)
        mapgen_report_map_use(vdefs[which_vault]);
#endif
    
    return (result);

[3.4618]

[3.4619]

    return (write_vault( vdefs[which_vault], vgrid, place, avoid ));

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

[5.609]

[6.3671]


#ifdef DEBUG_DIAGNOSTICS
    if (crawl_state.map_stat_gen)
        mapgen_report_map_use(place.map);
#endif

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

[7.8943]

#ifdef DEBUG_DIAGNOSTICS
    if (crawl_state.map_stat_gen)
        mapgen_report_map_use(place.map);
#endif

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

B:BD[2.2437] → [2.2437:2651]

std::map<std::string, int> mapgen_try_count;
std::map<std::string, int> mapgen_use_count;
std::map<level_id, int> mapgen_level_maps;
std::map<std::string, std::string> mapgen_errors;
std::string mapgen_last_error;

[2.2437]

[2.2651]

static std::map<std::string, int> mapgen_try_count;
static std::map<std::string, int> mapgen_use_count;
static std::map<level_id, int> mapgen_level_mapcounts;
static std::map< level_id, std::set<std::string> > mapgen_level_mapsused;
static std::map<std::string, std::string> mapgen_errors;
static std::string mapgen_last_error;

Deletion in crawl-ref/source/debug.cc at line 2175 [4.4016436]
B:BD[2.4042] → [2.4042:4088]
```
    mapgen_level_maps[level_id::current()]++;
```

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

[2.4174]

    mapgen_level_mapcounts[level_id::current()]++;
    mapgen_level_mapsused[level_id::current()].insert(map.name);

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

B:BD[2.5135] → [2.5135:5192]

        for (int dep = 1; dep <= branches[i].depth; ++i)

[2.5135]

[2.5192]

        for (int dep = 1; dep <= branches[i].depth; ++dep)

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

B:BD[2.5243] → [2.5243:5315]

            if (mapgen_level_maps.find(lid) == mapgen_level_maps.end())

[2.5243]

[2.5315]

            if (mapgen_level_mapcounts.find(lid)
                    == mapgen_level_mapcounts.end())

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

B:BD[2.5519] → [2.5519:5596]

            fprintf(outf, "%d) %s\n", i + 1, mapless[i].describe().c_str());

[2.5519]

[2.5596]

            fprintf(outf, "%3d) %s\n", i + 1, mapless[i].describe().c_str());
    }
    fprintf(outf, "\n\nMaps by level:\n\n");
    for (std::map<level_id, std::set<std::string> >::const_iterator i =
             mapgen_level_mapsused.begin(); i != mapgen_level_mapsused.end();
         ++i)
    {
        std::string line =
            make_stringf("%-10s: ", i->first.describe().c_str());
        const std::set<std::string> &maps = i->second;
        bool unfinished = false;
        for (std::set<std::string>::const_iterator j = maps.begin();
             j != maps.end(); ++j)
        {
            if (j != maps.begin())
                line += ", ";
            line += *j;
            if (line.length() > 79)
            {
                unfinished = true;
                break;
            }
        }
        const unsigned margin = unfinished? 74 : 79;
        if (line.length() > margin)
            line = line.substr(0, margin);
        fprintf(outf, "%s%s\n", line.c_str(), unfinished? ", ..." : "");