fiddlerwoaroof/crawl - Change LCCFD6BLLDJO3PVPKKJ7YJ4PQUHLUKQBWRCYRH26UVMOTYZPJQRQC

Fall back to ASCII if Unicode locale is unavailable (Guus). Also queue up startup error messages and display them before the newgame screen instead of emitting them to stderr.

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

Created by dshaligram on November 20, 2007

LCCFD6BLLDJO3PVPKKJ7YJ4PQUHLUKQBWRCYRH26UVMOTYZPJQRQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/stuff.cc at line 447 [5.224557]

B:BD[4.12500] → [4.12500:12622]

        end(1, false,
            "Unicode glyphs are not available, please change your "
            "char_set option");

[4.12500]

[6.262]

    {
        crawl_state.add_startup_error(
            "Unicode glyphs are not available, falling back to ASCII.");
        Options.char_set = CSET_ASCII;
    }

Insertion in crawl-ref/source/state.h at line 17 [7.42804]
[2.1190]
[2.1190]
```
#include <vector>
```
Insertion in crawl-ref/source/state.h at line 69 [7.42804]
[8.1044]
[8.1044]
```
    std::vector<std::string> startup_errors;
    
```

Insertion in crawl-ref/source/state.h at line 86 [7.42804]

[8.1233]

    void add_startup_error(const std::string &error);
    void show_startup_errors();

Insertion in crawl-ref/source/state.cc at line 41 [8.1546]

[8.2682]

}
void game_state::add_startup_error(const std::string &err)
{
    startup_errors.push_back(err);
}
void game_state::show_startup_errors()
{
    formatted_scroller error_menu;
    error_menu.set_flags(MF_NOSELECT | MF_ALWAYS_SHOW_MORE | MF_NOWRAP
                         | MF_EASY_EXIT);
    error_menu.set_more(
        formatted_string::parse_string(
                           "<cyan>[ + : Page down.   - : Page up."
                           "                    Esc or Enter to continue.]"));
    error_menu.set_title(
        new MenuEntry("Warning: Crawl encountered errors during startup:",
                      MEL_TITLE));
    for (int i = 0, size = startup_errors.size(); i < size; ++i)
        error_menu.add_entry(new MenuEntry(startup_errors[i]));
    error_menu.show();

Insertion in crawl-ref/source/newgame.cc at line 96 [5.1132300]
[5.1135597]
[5.1135597]
```
#include "state.h"
```

Insertion in crawl-ref/source/newgame.cc at line 728 [5.1132300]

[9.7132]


    if (!crawl_state.startup_errors.empty()
        && !Options.suppress_startup_errors)
    {
        crawl_state.show_startup_errors();
        clrscr();
    }

Replacement in crawl-ref/source/initfile.cc at line 375 [5.2957258]

B:BD[10.393438] → [10.393438:393514]

            fprintf(stderr, "Bad highlight string -- %s\n", field.c_str());

[10.393438]

[10.393514]

            crawl_state.add_startup_error(
                make_stringf("Bad highlight string -- %s\n", field.c_str()));

Replacement in crawl-ref/source/initfile.cc at line 381 [5.2957258]

∅:D[3.312] → [10.393602:393666]

B:BD[10.393602] → [10.393602:393666]

        fprintf( stderr, "Bad colour -- %s\n", field.c_str() );

[3.312]

[10.393666]

        crawl_state.add_startup_error(
            make_stringf( "Bad colour -- %s\n", field.c_str() ) );

Replacement in crawl-ref/source/initfile.cc at line 472 [5.2957258]

B:BD[11.789636] → [11.789636:789708]

            fprintf(stderr, "Unknown delay: %s\n", delay_name.c_str());

[11.789636]

[11.789708]

            crawl_state.add_startup_error(
                make_stringf("Unknown delay: %s\n", delay_name.c_str()));

Replacement in crawl-ref/source/initfile.cc at line 490 [5.2957258]

B:BD[11.790083] → [11.790083:790192]

        fprintf(stderr, "Delay interrupt name \"%s\" not recognised.\n",
                interrupt.c_str());

[11.790083]

[11.790192]

        crawl_state.add_startup_error(
            make_stringf("Delay interrupt name \"%s\" not recognised.\n",
                         interrupt.c_str()));

Replacement in crawl-ref/source/initfile.cc at line 507 [5.2957258]

B:BD[11.790553] → [11.790553:790624]

        fprintf(stderr, "Unknown delay: %s\n", activity_name.c_str());

[11.790553]

[11.790624]

        crawl_state.add_startup_error(
            make_stringf("Unknown delay: %s\n", activity_name.c_str()));

Insertion in crawl-ref/source/initfile.cc at line 606 [5.2957258]
[11.792070]
[12.772]
```
    suppress_startup_errors = false;
    
```

Insertion in crawl-ref/source/initfile.cc at line 1645 [5.2957258]

[12.999]

[11.800184]

    }
    else if (key == "suppress_startup_errors")
    {
        suppress_startup_errors = read_bool( field, suppress_startup_errors );

Replacement in crawl-ref/source/initfile.cc at line 2114 [5.2957258]

B:BD[10.417351] → [10.417351:417428]

            fprintf(stderr, "Unknown wiz_mode option: %s\n", field.c_str());

[10.417351]

[10.417428]

            crawl_state.add_startup_error(
                make_stringf("Unknown wiz_mode option: %s\n", field.c_str()));

Replacement in crawl-ref/source/initfile.cc at line 2166 [5.2957258]

B:BD[13.1959] → [13.1959:2037]

                fprintf(stderr, "Bad hp_colour string: %s\n", field.c_str());

[13.1959]

[13.2037]

                crawl_state.add_startup_error(
                    make_stringf("Bad hp_colour string: %s\n", field.c_str()));

Replacement in crawl-ref/source/initfile.cc at line 2190 [5.2957258]

B:BD[13.2805] → [13.2805:2883]

                fprintf(stderr, "Bad mp_colour string: %s\n", field.c_str());

[13.2805]

[13.2883]

                crawl_state.add_startup_error(
                    make_stringf("Bad mp_colour string: %s\n", field.c_str()));

Replacement in crawl-ref/source/initfile.cc at line 2212 [5.2957258]

B:BD[13.3306] → [14.1395:1508]

                fprintf(stderr, "Bad skill level to note -- %s\n",
                        thesplit[i].c_str());

[13.3306]

[14.1508]

                crawl_state.add_startup_error(
                    make_stringf("Bad skill level to note -- %s\n",
                                 thesplit[i].c_str()));

Insertion in crawl-ref/source/externs.h at line 1478 [5.3270163]
[15.8694]
[16.15063]
```
    bool        suppress_startup_errors;
```