fiddlerwoaroof/crawl - Change JQK4F4RTKVQWIF5YKFPH7IHF7UREBOY2NOFQ7J3O44KYPCNHNL5AC

Experimentally dump the new overview screen rather than the old one.

I'm actually not entirely convinced this is the way to go. a) The new one is more informative, but the dump already contains all that extra information in a much more detail. b) The new one is much more concise, but that's something that's not necessary in the dump.

On the plus side, new players doesn't have to get used to two different designs. Anyway, the old dump is still there, and we could use the dump options to let the player choose which one to use.

For now, let's try whether it's possible to get used to this one.

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

Created by j-p-e-g on May 24, 2008

JQK4F4RTKVQWIF5YKFPH7IHF7UREBOY2NOFQ7J3O44KYPCNHNL5AC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/output.h at line 67 [7.1087719]
[6.330]
[6.500]
```
std::string dump_overview_screen(bool full_id);
```
Replacement in crawl-ref/source/output.cc at line 1009 [7.1088282]
∅:D[2.3453] → [8.8739:8792]
∅:D[9.4547] → [8.8739:8792]
B:BD[8.8739] → [8.8739:8792]
```
}                               // end draw_border()
```
[2.3453]
[8.8792]
```
}
```

Replacement in crawl-ref/source/output.cc at line 1042 [7.1088282]

B:BD[5.3352] → [5.3352:3442]

    desc += mon->name(list_a ? DESC_NOCAP_A : DESC_PLAIN);
    if (!(mon->mname).empty())

[5.3352]

[5.3442]

    if (mons_is_mimic(mon->type))
    {
        if (list_a)
            desc += "a ";
        desc += "mimic";
    }
    else

Replacement in crawl-ref/source/output.cc at line 1050 [7.1088282]

B:BD[5.3448] → [5.3448:3546]

        desc += " (";
        desc += mons_type_name(mon->type, DESC_PLAIN);
        desc += ")";

[5.3448]

[5.3546]

        desc += mon->name(list_a ? DESC_NOCAP_A : DESC_PLAIN);
        if (!(mon->mname).empty())
        {
            desc += " (";
            desc += mons_type_name(mon->type, DESC_PLAIN);
            desc += ")";
        }

Deletion in crawl-ref/source/output.cc at line 1058 [7.1088282]
B:BD[5.3552] → [5.3552:3553]

Replacement in crawl-ref/source/output.cc at line 1108 [7.1088282]

B:BD[5.5176] → [5.5176:5230]

                        && !mons_is_mimic(mon->type))

[5.5176]

[5.5230]

                        && (!mons_is_mimic(mon->type)
                            || testbits(mon->flags, MF_KNOWN_MIMIC)))

Replacement in crawl-ref/source/output.cc at line 1311 [7.1088282]

B:BD[10.6375] → [10.6375:6446]

    // skip forward to past the end of the range of identical monsters

[10.6375]

[10.6446]

    // Skip forward to past the end of the range of identical monsters.

Replacement in crawl-ref/source/output.cc at line 1315 [7.1088282]

B:BD[10.6522] → [10.6522:6590]

        // Array is sorted, so if !(m1 < m2), m1 and m2 are "equal"

[10.6522]

[10.6590]

        // Array is sorted, so if !(m1 < m2), m1 and m2 are "equal".

Replacement in crawl-ref/source/output.cc at line 1321 [7.1088282]
B:BD[10.6745] → [11.2976:3022]
```
    // Print info on the monsters we've found
```
[10.6745]
[10.6815]
```
    // Print info on the monsters we've found.
```

Replacement in crawl-ref/source/output.cc at line 1344 [7.1088282]

B:BD[11.3487] → [11.3487:3544]

            // Print an "icon" representing damage level

[11.3487]

[4.2550]

            // Print an "icon" representing damage level.

Replacement in crawl-ref/source/output.cc at line 1394 [7.1088282]
B:BD[10.7512] → [10.7512:7562]
```
    // Set start to the next un-described monster
```
[10.7512]
[10.7562]
```
    // Set start to the next un-described monster.
```
Replacement in crawl-ref/source/output.cc at line 1537 [7.1088282]
B:BD[12.206591] → [13.6781:6831]
```
// old overview screen, now only used for dumping
```
[12.206591]
[14.475]
```
// Old overview screen, now only used for dumping.
```

Replacement in crawl-ref/source/output.cc at line 1916 [7.1088282]

B:BD[15.1279] → [16.52348:52431]

    for (int count = 0; linelength >= get_number_of_cols() && count < 2; count++ )

[15.1279]

[6.1677]

    for (int count = 0; linelength >= get_number_of_cols() && count < 2;
         count++)

Replacement in crawl-ref/source/output.cc at line 1934 [7.1088282]

B:BD[15.1366] → [15.1366:1421]

            + strlen(race_class) + strlen(time_turns);

[15.1366]

[15.1421]

                     + strlen(race_class) + strlen(time_turns);

Replacement in crawl-ref/source/output.cc at line 1949 [7.1088282]

B:BD[17.2686] → [17.2686:2763]

B:BD[17.2763] → [3.2550:2586]

// new scrollable status overview screen,
// including stats, mutations etc.
char _get_overview_screen_results()

[17.2686]

[17.2792]

static std::vector<formatted_string> _get_overview_cols1()

Replacement in crawl-ref/source/output.cc at line 1951 [7.1088282]

B:BD[17.2794] → [17.2794:3148]

    bool calc_unid = false;
    formatted_scroller overview;
    // Set flags, and don't use easy exit.
    overview.set_flags(MF_SINGLESELECT | MF_ALWAYS_SHOW_MORE | MF_NOWRAP, false);
    overview.set_more( formatted_string::parse_string(
                       "<cyan>[ + : Page down.   - : Page up.   Esc exits.]"));
    overview.set_tag("resists");

[17.2794]

[17.3148]

    char buf[1000];

Deletion in crawl-ref/source/output.cc at line 1953 [7.1088282]
B:BD[17.3149] → [17.3149:3199]
∅:D[17.3199] → [16.53120:53140]
B:BD[16.53120] → [16.53120:53140]
```
    overview.add_text(_overview_screen_title());
    char buf[1000];
```
Insertion in crawl-ref/source/output.cc at line 1959 [7.1088282]
[16.53327]
[16.53327]
```
    {
```
Insertion in crawl-ref/source/output.cc at line 1962 [7.1088282]
[16.53448]
[16.53449]
```
    }
```
Insertion in crawl-ref/source/output.cc at line 1975 [7.1088282]
[16.53740]
[18.419]
```
    {
```
Insertion in crawl-ref/source/output.cc at line 1978 [7.1088282]
[16.53857]
[16.53857]
```
    }
```
Deletion in crawl-ref/source/output.cc at line 2007 [7.1088282]
B:BD[9.4890] → [9.4890:4896]
```
    {
```
Replacement in crawl-ref/source/output.cc at line 2008 [7.1088282]
B:BD[9.4964] → [9.4964:4970]
```
    }
```
[9.4964]
[16.54593]
Insertion in crawl-ref/source/output.cc at line 2048 [7.1088282]
[16.55800]
[16.55800]
```
    return cols1.formatted_lines();
}
```

Replacement in crawl-ref/source/output.cc at line 2052 [7.1088282]

B:BD[16.55801] → [17.3200:3433]

    {
        std::vector<formatted_string> blines = cols1.formatted_lines();
        for (unsigned int i = 0; i < blines.size(); ++i )
            overview.add_item_formatted_string(blines[i]);
        overview.add_text(" ");
    }

[16.55801]

[15.1428]

static std::vector<formatted_string> _get_overview_cols2(
    std::vector<char> &equip_chars, bool calc_unid = false)
{
    char buf[1000];

Deletion in crawl-ref/source/output.cc at line 2157 [7.1088282]
B:BD[16.60402] → [19.2567:2602]
```
    std::vector<char> equip_chars;
```
Insertion in crawl-ref/source/output.cc at line 2158 [7.1088282]
[20.5395]
[16.61039]
```
    return cols.formatted_lines();
}
```

Insertion in crawl-ref/source/output.cc at line 2162 [7.1088282]

[16.61040]

[19.3047]

// New scrollable status overview screen, including stats, mutations etc.
char _get_overview_screen_results()
{
    bool calc_unid = false;
    formatted_scroller overview;
    // Set flags, and don't use easy exit.
    overview.set_flags(MF_SINGLESELECT | MF_ALWAYS_SHOW_MORE | MF_NOWRAP, false);
    overview.set_more( formatted_string::parse_string(
                       "<cyan>[ + : Page down.   - : Page up.   Esc exits.]"));
    overview.set_tag("resists");
    overview.add_text(_overview_screen_title());

Replacement in crawl-ref/source/output.cc at line 2176 [7.1088282]

B:BD[19.3053] → [17.3434:3505]

        std::vector<formatted_string> blines = cols.formatted_lines();

[19.3053]

[17.3505]

        std::vector<formatted_string> blines = _get_overview_cols1();
        for (unsigned int i = 0; i < blines.size(); ++i )
            overview.add_item_formatted_string(blines[i]);
        overview.add_text(" ");
    }
    {
        std::vector<char> equip_chars;
        std::vector<formatted_string> blines = _get_overview_cols2(equip_chars,
                                                                   calc_unid);

Insertion in crawl-ref/source/output.cc at line 2201 [7.1088282]

[3.2706]

[21.4005]

}
std::string dump_overview_screen(bool full_id)
{
    std::string text = formatted_string::parse_string(_overview_screen_title());
    text += EOL;
    std::vector<formatted_string> blines = _get_overview_cols1();
    for (unsigned int i = 0; i < blines.size(); ++i)
    {
        text += blines[i];
        text += EOL;
    }
    text += EOL;
    std::vector<char> equip_chars;
    blines = _get_overview_cols2(equip_chars, full_id);
    for (unsigned int i = 0; i < blines.size(); ++i)
    {
        text += blines[i];
        text += EOL;
    }
    text += EOL;
    text += formatted_string::parse_string(_status_mut_abilities());
    text += EOL;
    return text;

Replacement in crawl-ref/source/output.cc at line 2248 [7.1088282]

B:BD[16.62420] → [16.62420:62505]

// creates rows of short descriptions for current
// status, mutations and abilities

[16.62420]

[13.9455]

// Creates rows of short descriptions for current
// status, mutations and abilities.

Insertion in crawl-ref/source/output.cc at line 2492 [7.1088282]
[22.5135]
[6.8385]
```
//  Commenting out until this information is actually meaningful. (jpeg)
```
Insertion in crawl-ref/source/chardump.cc at line 194 [7.4100336]
[23.1211340]
[14.3719]
```
/*
```
Insertion in crawl-ref/source/chardump.cc at line 203 [7.4100336]
[14.3943]
[14.3943]
```
*/
    par.text += dump_overview_screen(par.full_id);
```

Experimentally dump the new overview screen rather than the old one.

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/output.h at line 67 [7.1087719]

Replacement in crawl-ref/source/output.cc at line 1009 [7.1088282]

Replacement in crawl-ref/source/output.cc at line 1042 [7.1088282]

Replacement in crawl-ref/source/output.cc at line 1050 [7.1088282]

Deletion in crawl-ref/source/output.cc at line 1058 [7.1088282]

Replacement in crawl-ref/source/output.cc at line 1108 [7.1088282]

Replacement in crawl-ref/source/output.cc at line 1311 [7.1088282]

Replacement in crawl-ref/source/output.cc at line 1315 [7.1088282]

Replacement in crawl-ref/source/output.cc at line 1321 [7.1088282]

Replacement in crawl-ref/source/output.cc at line 1344 [7.1088282]

Replacement in crawl-ref/source/output.cc at line 1394 [7.1088282]

Replacement in crawl-ref/source/output.cc at line 1537 [7.1088282]

Replacement in crawl-ref/source/output.cc at line 1916 [7.1088282]

Replacement in crawl-ref/source/output.cc at line 1934 [7.1088282]

Replacement in crawl-ref/source/output.cc at line 1949 [7.1088282]

Replacement in crawl-ref/source/output.cc at line 1951 [7.1088282]

Deletion in crawl-ref/source/output.cc at line 1953 [7.1088282]

Insertion in crawl-ref/source/output.cc at line 1959 [7.1088282]

Insertion in crawl-ref/source/output.cc at line 1962 [7.1088282]

Insertion in crawl-ref/source/output.cc at line 1975 [7.1088282]

Insertion in crawl-ref/source/output.cc at line 1978 [7.1088282]

Deletion in crawl-ref/source/output.cc at line 2007 [7.1088282]

Replacement in crawl-ref/source/output.cc at line 2008 [7.1088282]

Insertion in crawl-ref/source/output.cc at line 2048 [7.1088282]

Replacement in crawl-ref/source/output.cc at line 2052 [7.1088282]

Deletion in crawl-ref/source/output.cc at line 2157 [7.1088282]

Insertion in crawl-ref/source/output.cc at line 2158 [7.1088282]

Insertion in crawl-ref/source/output.cc at line 2162 [7.1088282]

Replacement in crawl-ref/source/output.cc at line 2176 [7.1088282]

Insertion in crawl-ref/source/output.cc at line 2201 [7.1088282]

Replacement in crawl-ref/source/output.cc at line 2248 [7.1088282]

Insertion in crawl-ref/source/output.cc at line 2492 [7.1088282]

Insertion in crawl-ref/source/chardump.cc at line 194 [7.4100336]

Insertion in crawl-ref/source/chardump.cc at line 203 [7.4100336]