fiddlerwoaroof/crawl - Change IXW2IM5ITYDCXDB3ORDDVAR5XUSPVQ3BWLP3Q6TRXNTIKGMZTHXAC

For FR 1934370

Add "classic_hud" option. Defaults to false. Removes hp bar, monster list. Added some macros to reduce copy/paste in initfile.cc. Renamed mlist_allow_inline to mlist_allow_alternate_layout so the sense is more accurate.

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

Created by pauldubois on April 7, 2008

IXW2IM5ITYDCXDB3ORDDVAR5XUSPVQ3BWLP3Q6TRXNTIKGMZTHXAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/view.cc at line 4993 [7.16817]

B:BD[6.558] → [6.558:815]

        if (mlistsz.y < Options.mlist_min_height)
            _increment(mlistsz.y, leftover_rightcol_y(), Options.mlist_min_height);
        _increment(msgsz.y,  leftover_y(), MSG_MAX_HEIGHT);
        _increment(mlistsz.y, leftover_rightcol_y(), INT_MAX);

[6.558]

[8.3876]

        if (Options.classic_hud)
        {
            mlistsz.y = 0;
            _increment(msgsz.y,  leftover_y(), MSG_MAX_HEIGHT);
        }
        else
        {
            if (mlistsz.y < Options.mlist_min_height)
                _increment(mlistsz.y, leftover_rightcol_y(), Options.mlist_min_height);
            _increment(msgsz.y,  leftover_y(), MSG_MAX_HEIGHT);
            _increment(mlistsz.y, leftover_rightcol_y(), INT_MAX);
        }

Replacement in crawl-ref/source/view.cc at line 5179 [7.16817]

B:BD[8.7130] → [8.7130:7186]

    if (!Options.mlist_force_inline && lay_mlist.valid)

[8.7130]

[8.7186]

    if (  !Options.mlist_allow_alternate_layout
       && !Options.classic_hud
       &&  lay_mlist.valid)
    {

Insertion in crawl-ref/source/view.cc at line 5184 [7.16817]
[8.7215]
[9.1627]
```
    }
```

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

B:BD[10.3255] → [6.4557:4621]

    draw_mp_bar(19, y, you.magic_points, you.max_magic_points);

[10.3255]

[10.3347]


    if (! Options.classic_hud)
        draw_mp_bar(19, y, you.magic_points, you.max_magic_points);

Replacement in crawl-ref/source/output.cc at line 300 [7.1088282]
∅:D[4.2800] → [6.4789:4833]
B:BD[10.4245] → [6.4789:4833]
```
    draw_hp_bar(19, y, you.hp, you.hp_max);
```
[4.2800]
[10.4312]
```
    if (! Options.classic_hud)
        draw_hp_bar(19, y, you.hp, you.hp_max);
```
Replacement in crawl-ref/source/initfile.cc at line 616 [7.2957258]
B:BD[11.5102] → [5.2644:2675]
```
    mlist_force_inline = true;
```
[11.5102]
[12.10415]
```
    mlist_allow_alternate_layout = false;
    classic_hud = false;
```

Insertion in crawl-ref/source/initfile.cc at line 1570 [7.2957258]

[13.404321]

#define BOOL_OPTION_NAMED(_opt_str, _opt_var)                     \
    if (key == _opt_str) do {                               \
        this->_opt_var = _read_bool(field, this->_opt_var); \
    } while (false)
#define BOOL_OPTION(_opt) BOOL_OPTION_NAMED(#_opt, _opt)
#define COLOUR_OPTION_NAMED(_opt_str, _opt_var)                               \
    if (key == _opt_str) do {                                           \
        const int col = str_to_colour( field );                         \
        if (col != -1) {                                                \
            this->_opt_var = col;                                       \
        } else {                                                        \
            /*fprintf( stderr, "Bad %s -- %s\n", key, field.c_str() );*/ \
            crawl_state.add_startup_error(                              \
                make_stringf("Bad %s -- %s\n",                          \
                    key.c_str(), field.c_str()));                       \
        }                                                               \
    } while (false)
#define COLOUR_OPTION(_opt) COLOUR_OPTION_NAMED(#_opt, _opt)
#define CURSES_OPTION_NAMED(_opt_str, _opt_var)           \
    if (key == _opt_str) do {                       \
        this->_opt_var = curses_attribute(field);   \
    } while (false)
#define CURSES_OPTION(_opt) CURSES_OPTION_NAMED(#_opt, _opt)

Replacement in crawl-ref/source/initfile.cc at line 1768 [7.2957258]

B:BD[14.5853881] → [15.17452:17570]

B:BD[15.17570] → [16.10334:10414]

∅:D[16.10414] → [15.17649:17655]

B:BD[15.17649] → [15.17649:17655]

∅:D[15.17655] → [17.799895:799943]

∅:D[14.5853881] → [17.799895:799943]

B:BD[17.799895] → [17.799895:799943]

B:BD[17.799943] → [18.768:819]

B:BD[18.819] → [16.10415:10475]

∅:D[18.878] → [13.406800:406806]

∅:D[16.10475] → [13.406800:406806]

∅:D[17.800039] → [13.406800:406806]

B:BD[13.406800] → [13.406800:406806]

B:BD[13.406806] → [17.800040:800088]

B:BD[17.800088] → [18.879:930]

B:BD[18.930] → [16.10476:10536]

∅:D[16.10536] → [19.809:922]

B:BD[18.989] → [19.809:922]

B:BD[19.922] → [16.10537:10615]

∅:D[16.10615] → [20.2249:2308]

B:BD[19.999] → [20.2249:2308]

B:BD[20.2308] → [16.10616:10696]

∅:D[18.989] → [17.800184:800190]

∅:D[19.999] → [17.800184:800190]

∅:D[20.2387] → [17.800184:800190]

∅:D[16.10696] → [17.800184:800190]

B:BD[17.800184] → [17.800184:800190]

B:BD[13.407123] → [13.407123:407206]

B:BD[13.407206] → [16.10697:10749]

∅:D[16.10749] → [13.407273:407381]

∅:D[17.800468] → [13.407273:407381]

B:BD[13.407273] → [13.407273:407381]

B:BD[13.407381] → [16.10750:10804]

∅:D[16.10804] → [13.407450:407456]

∅:D[17.800522] → [13.407450:407456]

B:BD[13.407450] → [13.407450:407456]

    else if (key == "use_old_selection_order")
    {
        // use old order of species/classes on selection screen?
        use_old_selection_order = _read_bool( field, use_old_selection_order );
    }
    else if (key == "default_autopickup")
    {
        // should autopickup default to on or off?
        autopickup_on = _read_bool( field, autopickup_on );
    }
    else if (key == "default_autoprayer")
    {
        // should autoprayer default to on or off?
        autoprayer_on = _read_bool( field, autoprayer_on );
    }
    else if (key == "show_inventory_weights")
    {
        // should weights be shown on inventory items?
        show_inventory_weights = _read_bool( field, show_inventory_weights );
    }
    else if (key == "suppress_startup_errors")
    {
        suppress_startup_errors = _read_bool( field, suppress_startup_errors );
    }
    else if (key == "clean_map")
    {
        // removes monsters/clouds from map
        clean_map = _read_bool( field, clean_map );
    }
    else if (key == "colour_map" || key == "color_map")
    {
        // colour-codes play-screen map
        colour_map = _read_bool( field, colour_map );
    }

[14.5853881]

[13.407456]

    else BOOL_OPTION(use_old_selection_order);
    else BOOL_OPTION_NAMED("default_autopickup", autopickup_on);
    else BOOL_OPTION_NAMED("default_autoprayer", autoprayer_on);
    else BOOL_OPTION(show_inventory_weights);
    else BOOL_OPTION(suppress_startup_errors);
    else BOOL_OPTION(clean_map);
    else BOOL_OPTION(colour_map);
    else BOOL_OPTION_NAMED("color_map", colour_map);  // common misspelling :)

Deletion in crawl-ref/source/initfile.cc at line 1783 [7.2957258]
∅:D[17.800662] → [13.407817:407823]
B:BD[13.407817] → [13.407817:407823]
B:BD[13.407823] → [17.800663:800754]
∅:D[17.800754] → [13.407867:407924]
B:BD[13.407867] → [13.407867:407924]
B:BD[13.407924] → [16.10805:10857]
∅:D[16.10857] → [17.800807:800873]
B:BD[17.800807] → [17.800807:800873]
∅:D[17.800873] → [13.408058:408151]
B:BD[13.408058] → [13.408058:408151]
B:BD[13.408151] → [16.10858:10910]
∅:D[16.10910] → [13.408218:408224]
∅:D[17.800925] → [13.408218:408224]
B:BD[13.408218] → [13.408218:408224]
B:BD[13.408224] → [17.800926:800960]
B:BD[17.800960] → [16.10911:10988]
∅:D[16.10988] → [13.408283:408342]
∅:D[17.801035] → [13.408283:408342]
B:BD[13.408283] → [13.408283:408342]
B:BD[13.408342] → [16.10989:11047]
∅:D[16.11047] → [13.408413:408498]
∅:D[17.801093] → [13.408413:408498]
B:BD[13.408413] → [13.408413:408498]
B:BD[13.408498] → [16.11048:11106]
∅:D[16.11106] → [13.408571:408577]
∅:D[17.801151] → [13.408571:408577]
B:BD[13.408571] → [13.408571:408577]
B:BD[13.408577] → [21.321:373]
B:BD[21.373] → [16.11107:11185]
```
    }
    else if (key == "easy_quit_item_lists"
            || key == "easy_quit_item_prompts")
    {
        // allow aborting of item lists with space
        easy_quit_item_prompts = _read_bool( field,
                                        easy_quit_item_prompts );
    }
    else if (key == "easy_open")
    {
        // automatic door opening with movement
        easy_open = _read_bool( field, easy_open );
    }
    else if (key == "easy_armor" 
             || key == "easy_armour" 
             || key == "easy_unequip")
    {
        // automatic removal of armour when dropping
        easy_unequip = _read_bool( field, easy_unequip );
    }
    else if (key == "easy_butcher")
    {
        // automatic knife switching
        easy_butcher = _read_bool( field, easy_butcher );
    }
    else if (key == "always_confirm_butcher")
    {
        always_confirm_butcher = _read_bool( field, always_confirm_butcher );
```

Replacement in crawl-ref/source/initfile.cc at line 1784 [7.2957258]

B:BD[22.3787] → [22.3787:3828]

B:BD[22.3828] → [16.11186:11242]

∅:D[22.3883] → [21.450:456]

∅:D[16.11242] → [21.450:456]

B:BD[21.450] → [21.450:456]

    else if (key == "list_rotten")
    {
        list_rotten = _read_bool( field, list_rotten );
    }

[22.3787]

[13.408577]

    else BOOL_OPTION(easy_quit_item_prompts);
    else BOOL_OPTION_NAMED("easy_quit_item_lists", easy_quit_item_prompts);
    else BOOL_OPTION(easy_open);
    else BOOL_OPTION(easy_unequip);
    else BOOL_OPTION_NAMED("easy_armour", easy_unequip);
    else BOOL_OPTION_NAMED("easy_armor", easy_unequip);
    else BOOL_OPTION(easy_butcher);
    else BOOL_OPTION(always_confirm_butcher);
    else BOOL_OPTION(list_rotten);

Deletion in crawl-ref/source/initfile.cc at line 1825 [7.2957258]

B:BD[13.409675] → [13.409675:409880]

B:BD[13.409880] → [17.801231:801261]

∅:D[17.801261] → [13.409918:409999]

B:BD[13.409918] → [13.409918:409999]

∅:D[13.409999] → [7.2973056:2973057]

B:BD[7.2973056] → [7.2973056:2973057]

    }
    else if (key == "background")
    {
        // change background colour
        // Experimental! This may look really bad!
        const int col = str_to_colour( field );
        if (col != -1)
            background = col;
        else
            fprintf( stderr, "Bad colour -- %s\n", field.c_str() );

Replacement in crawl-ref/source/initfile.cc at line 1826 [7.2957258]

B:BD[13.410006] → [13.410006:410127]

B:BD[13.410127] → [17.801262:801302]

∅:D[17.801302] → [13.410175:410420]

B:BD[13.410175] → [13.410175:410420]

B:BD[13.410420] → [17.801303:801346]

∅:D[17.801346] → [13.410471:410595]

B:BD[13.410471] → [13.410471:410595]

    else if (key == "detected_item_colour")
    {
        const int col = str_to_colour( field );
        if (col != -1)
            detected_item_colour = col;
        else
            fprintf( stderr, "Bad detected_item_colour -- %s\n",
                     field.c_str());
    }
    else if (key == "detected_monster_colour")
    {
        const int col = str_to_colour( field );
        if (col != -1)
            detected_monster_colour = col;
        else
            fprintf( stderr, "Bad detected_monster_colour -- %s\n",
                     field.c_str());
    }

[13.410006]

[17.801347]

    else COLOUR_OPTION(background);
    else COLOUR_OPTION(detected_item_colour);
    else COLOUR_OPTION(detected_monster_colour);

Replacement in crawl-ref/source/initfile.cc at line 1862 [7.2957258]

∅:D[23.5494] → [13.411017:411221]

B:BD[13.411017] → [13.411017:411221]

B:BD[13.411221] → [17.802213:802261]

B:BD[18.1103] → [18.1103:1109]

B:BD[18.1109] → [24.3308:3406]

∅:D[18.1109] → [13.411283:411323]

∅:D[24.3406] → [13.411283:411323]

B:BD[13.411283] → [13.411283:411323]

B:BD[13.411323] → [17.802262:802308]

∅:D[17.802308] → [13.411377:411427]

B:BD[13.411377] → [13.411377:411427]

B:BD[13.411427] → [17.802309:802359]

B:BD[17.802359] → [25.1867:1919]

B:BD[25.1919] → [26.5452:5506]

∅:D[25.1971] → [13.411485:411491]

∅:D[26.5506] → [13.411485:411491]

∅:D[17.802359] → [13.411485:411491]

B:BD[13.411485] → [13.411485:411491]

B:BD[13.411491] → [27.690:792]

∅:D[27.792] → [13.411491:411722]

B:BD[13.411491] → [13.411491:411722]

B:BD[13.411722] → [16.11302:11362]

∅:D[16.11362] → [13.411797:411935]

∅:D[17.802419] → [13.411797:411935]

B:BD[13.411797] → [13.411797:411935]

B:BD[13.411935] → [17.802420:802466]

B:BD[17.802466] → [28.3473:3781]

∅:D[28.3781] → [13.412331:412337]

∅:D[17.802524] → [13.412331:412337]

B:BD[13.412331] → [13.412331:412337]

    else if (key == "friend_brand")
    {
        // Use curses attributes to mark friend
        // Some may look bad on some terminals.
        // As a suggestion, try "rxvt -rv -fn 10x20" under Un*xes
        friend_brand = curses_attribute(field);
    }
    else if (key == "neutral_brand")
    {
        neutral_brand = curses_attribute(field);
    }
    else if (key == "stab_brand")
    {
        stab_brand = curses_attribute(field);
    }
    else if (key == "may_stab_brand")
    {
        may_stab_brand = curses_attribute(field);
    }
    else if (key == "stair_item_brand")
    {
        feature_item_brand = curses_attribute(field);
    }
    else if (key == "trap_item_brand")
    {
        trap_item_brand = curses_attribute(field);
    }
    else if (key == "no_dark_brand")
    {
        // This is useful for terms where dark grey does
        // not have standout modes (since it's black on black).
        // This option will use light-grey instead in these cases.
        no_dark_brand = _read_bool( field, no_dark_brand );
    }
    else if (key == "heap_brand")
    {
        // See friend_brand option upstairs. no_dark_brand applies
        // here as well.
        heap_brand = curses_attribute(field);
    }
    else if (key == "status_caption_colour")
    {
        const int col = str_to_colour( field );
        if (col != -1)
            status_caption_colour = col;
        else
            crawl_state.add_startup_error(
                make_stringf("Bad status_caption_colour -- %s\n", field.c_str()));
    }

[23.5494]

[13.412337]

    else CURSES_OPTION(friend_brand);
    else CURSES_OPTION(neutral_brand);
    else CURSES_OPTION(stab_brand);
    else CURSES_OPTION(may_stab_brand);
    else CURSES_OPTION_NAMED("stair_item_brand", feature_item_brand);
    else CURSES_OPTION(trap_item_brand);
    // This is useful for terms where dark grey does
    // not have standout modes (since it's black on black).
    // This option will use light-grey instead in these cases.
    else BOOL_OPTION(no_dark_brand);
    // no_dark_brand applies here as well.
    else CURSES_OPTION(heap_brand);
    else COLOUR_OPTION(status_caption_colour);

Replacement in crawl-ref/source/initfile.cc at line 1921 [7.2957258]

B:BD[13.413724] → [3.2953:3069]

    else if (key == "fire_quiver_best")
    {
        fire_quiver_best = _read_bool(field, fire_quiver_best);
    }

[13.413724]

    else BOOL_OPTION(fire_quiver_best);

Deletion in crawl-ref/source/initfile.cc at line 1932 [7.2957258]
∅:D[29.1551] → [13.414045:414131]
∅:D[30.3061] → [13.414045:414131]
∅:D[17.803233] → [13.414045:414131]
B:BD[13.414045] → [13.414045:414131]
B:BD[13.414131] → [16.11445:11501]
∅:D[16.11501] → [13.414202:414251]
∅:D[17.803289] → [13.414202:414251]
B:BD[13.414202] → [13.414202:414251]
B:BD[13.414251] → [16.11502:11562]
```
    }
    else if (key == "random_pick")
    {
        // randomly generate character
        random_pick = _read_bool( field, random_pick );
    }
    else if (key == "remember_name")
    {
        remember_name = _read_bool( field, remember_name );
```
Insertion in crawl-ref/source/initfile.cc at line 1933 [7.2957258]
[31.1040]
[32.356]
```
    else BOOL_OPTION(random_pick);
    else BOOL_OPTION(remember_name);
```
Replacement in crawl-ref/source/initfile.cc at line 1943 [7.2957258]
∅:D[32.386] → [33.395:435]
B:BD[33.395] → [33.395:435]
B:BD[33.435] → [16.11563:11617]
∅:D[33.488] → [17.803590:803596]
∅:D[16.11617] → [17.803590:803596]
B:BD[17.803590] → [17.803590:803596]
B:BD[17.803596] → [34.577:616]
B:BD[34.616] → [16.11618:11670]
∅:D[16.11670] → [34.667:673]
B:BD[34.667] → [34.667:673]
```
    else if (key == "show_turns")
    {
        show_turns = _read_bool( field, show_turns );
    }
    else if (key == "show_beam")
    {
        show_beam = _read_bool( field, show_beam );
    }
```
[32.386]
[32.387]
```
    else BOOL_OPTION(show_turns);
    else BOOL_OPTION(show_beam);
```
Replacement in crawl-ref/source/initfile.cc at line 2007 [7.2957258]
B:BD[13.415776] → [13.415776:415809]
B:BD[13.415809] → [17.804716:804722]
B:BD[17.804722] → [16.11749:11801]
∅:D[16.11801] → [17.804773:804779]
B:BD[17.804773] → [17.804773:804779]
```
    else if (key == "auto_list")
    {
        auto_list = _read_bool( field, auto_list );
    }
```
[13.415776]
[35.211]
```
    else BOOL_OPTION(auto_list);
```
Deletion in crawl-ref/source/initfile.cc at line 2013 [7.2957258]
∅:D[36.14105] → [17.804994:805000]
B:BD[17.804994] → [17.804994:805000]
B:BD[17.805000] → [37.1298:1348]
B:BD[37.1348] → [16.11865:11939]
```
    }
    else if (key == "autopickup_no_burden")
    {
        autopickup_no_burden = _read_bool( field, autopickup_no_burden );
```
Insertion in crawl-ref/source/initfile.cc at line 2014 [7.2957258]
[38.4462]
[39.902]
```
    else BOOL_OPTION(autopickup_no_burden);
```
Replacement in crawl-ref/source/initfile.cc at line 2016 [7.2957258]
∅:D[39.930] → [38.4486:4525]
B:BD[38.4486] → [38.4486:4525]
B:BD[38.4525] → [16.11940:11990]
∅:D[16.11990] → [38.4574:4580]
B:BD[38.4574] → [38.4574:4580]
```
    else if (key == "messaging")
    {
        messaging = _read_bool(field, messaging);
    }
```
[39.930]
[38.4580]
```
    else BOOL_OPTION(messaging);
```
Replacement in crawl-ref/source/initfile.cc at line 2018 [7.2957258]
B:BD[38.4587] → [40.8603:8644]
B:BD[40.8644] → [16.11991:12045]
∅:D[16.12045] → [40.8697:8703]
B:BD[40.8697] → [40.8697:8703]
```
    else if (key == "mouse_input")
    {
        mouse_input = _read_bool(field, mouse_input);
    }
```
[38.4587]
[12.10580]
```
    else BOOL_OPTION(mouse_input);
```

Replacement in crawl-ref/source/initfile.cc at line 2044 [7.2957258]

B:BD[11.5308] → [11.5308:5424]

∅:D[11.5424] → [12.11086:11133]

B:BD[12.11086] → [12.11086:11133]

B:BD[12.11133] → [16.12046:12100]

∅:D[16.12100] → [12.11186:11233]

B:BD[12.11186] → [12.11186:11233]

B:BD[12.11233] → [16.12101:12155]

∅:D[16.12155] → [12.11286:11292]

B:BD[12.11286] → [12.11286:11292]

    else if (key == "mlist_force_inline")
    {
        mlist_force_inline = _read_bool(field, mlist_force_inline);
    }
    else if (key == "view_lock_x")
    {
        view_lock_x = _read_bool(field, view_lock_x);
    }
    else if (key == "view_lock_y")
    {
        view_lock_y = _read_bool(field, view_lock_y);
    }

[11.5308]

[12.11292]

    else BOOL_OPTION(mlist_allow_alternate_layout);
    else BOOL_OPTION(classic_hud);
    else BOOL_OPTION(view_lock_x);
    else BOOL_OPTION(view_lock_y);

Replacement in crawl-ref/source/initfile.cc at line 2053 [7.2957258]

B:BD[12.11429] → [12.11429:11475]

B:BD[12.11475] → [16.12208:12272]

∅:D[16.12272] → [12.11538:11590]

B:BD[12.11538] → [12.11538:11590]

B:BD[12.11590] → [16.12273:12337]

∅:D[16.12337] → [12.11653:11659]

B:BD[12.11653] → [12.11653:11659]

    else if (key == "center_on_scroll")
    {
        center_on_scroll = _read_bool(field, center_on_scroll);
    }
    else if (key == "symmetric_scroll")
    {
        symmetric_scroll = _read_bool(field, symmetric_scroll);
    }

[12.11429]

[12.11659]

    else BOOL_OPTION(center_on_scroll);
    else BOOL_OPTION(symmetric_scroll);

Deletion in crawl-ref/source/initfile.cc at line 2078 [7.2957258]
∅:D[41.5140] → [17.805090:805140]
B:BD[17.805090] → [17.805090:805140]
B:BD[17.805140] → [16.12338:12400]
∅:D[16.12400] → [17.805201:805252]
B:BD[17.805201] → [17.805201:805252]
B:BD[17.805252] → [16.12401:12465]
∅:D[16.12465] → [13.415882:415937]
∅:D[17.805315] → [13.415882:415937]
B:BD[13.415882] → [13.415882:415937]
B:BD[13.415937] → [16.12466:12538]
```
    }
    else if (key == "note_skill_max")
    {
        note_skill_max = _read_bool( field, note_skill_max );
    }
    else if (key == "note_all_spells")
    {
        note_all_spells = _read_bool( field, note_all_spells );
    }
    else if (key == "delay_message_clear")
    {
        delay_message_clear = _read_bool( field, delay_message_clear );
```

Insertion in crawl-ref/source/initfile.cc at line 2079 [7.2957258]

[13.416145]

    else BOOL_OPTION(note_skill_max);
    else BOOL_OPTION(note_all_spells);
    else BOOL_OPTION(delay_message_clear);

Replacement in crawl-ref/source/initfile.cc at line 2222 [7.2957258]
∅:D[17.807074] → [13.417560:417603]
B:BD[13.417560] → [13.417560:417603]
B:BD[13.417603] → [16.13299:13357]
∅:D[16.13357] → [13.417676:417720]
∅:D[17.807132] → [13.417676:417720]
B:BD[13.417676] → [13.417676:417720]
B:BD[13.417720] → [17.807133:807139]
B:BD[17.807139] → [16.13358:13418]
∅:D[16.13418] → [17.807198:807204]
B:BD[17.807198] → [17.807198:807204]
```
    else if (key == "pickup_thrown")
    {
        pickup_thrown = _read_bool(field, pickup_thrown);
    }
    else if (key == "pickup_dropped")
    {
        pickup_dropped = _read_bool(field, pickup_dropped);
    }
```
[17.807074]
[17.807204]
```
    else BOOL_OPTION(pickup_thrown);
    else BOOL_OPTION(pickup_dropped);
```
Replacement in crawl-ref/source/initfile.cc at line 2285 [7.2957258]
B:BD[13.418550] → [42.1854:1899]
B:BD[42.1899] → [16.13419:13481]
∅:D[16.13481] → [42.1960:1966]
B:BD[42.1960] → [42.1960:1966]
∅:D[42.1966] → [13.418550:418590]
B:BD[13.418550] → [13.418550:418590]
B:BD[13.418722] → [13.418722:418728]
B:BD[13.418728] → [16.13482:13546]
∅:D[16.13546] → [13.419293:419299]
∅:D[17.808723] → [13.419293:419299]
B:BD[13.419293] → [13.419293:419299]
```
    else if (key == "use_fake_cursor")
    {
        use_fake_cursor = _read_bool(field, use_fake_cursor);
    }
    else if (key == "macro_meta_entry")
    {
        macro_meta_entry = _read_bool(field, macro_meta_entry);
    }
```
[13.418550]
[17.808724]
```
    else BOOL_OPTION(use_fake_cursor);
    else BOOL_OPTION(macro_meta_entry);
```

Replacement in crawl-ref/source/initfile.cc at line 2345 [7.2957258]

B:BD[13.420786] → [43.192:242]

B:BD[43.242] → [16.13547:13619]

∅:D[16.13619] → [43.313:319]

B:BD[43.313] → [43.313:319]

∅:D[43.319] → [17.809713:809777]

B:BD[13.420786] → [17.809713:809777]

B:BD[17.809777] → [16.13620:13674]

∅:D[16.13674] → [17.809830:809836]

B:BD[17.809830] → [17.809830:809836]

∅:D[17.809836] → [13.420786:420830]

B:BD[13.420786] → [13.420786:420830]

B:BD[13.420830] → [16.13675:13735]

∅:D[16.13735] → [13.420905:420969]

∅:D[17.809896] → [13.420905:420969]

B:BD[13.420905] → [13.420905:420969]

B:BD[13.420969] → [17.809897:809937]

B:BD[17.809937] → [16.13736:13797]

∅:D[16.13797] → [13.421085:421091]

∅:D[17.809997] → [13.421085:421091]

B:BD[13.421085] → [13.421085:421091]

    else if (key == "classic_item_colours")
    {
        classic_item_colours = _read_bool(field, classic_item_colours);
    }
    else if (key == "item_colour" || key == "item_color")
    {
        item_colour = _read_bool(field, item_colour);
    }
    else if (key == "easy_exit_menu")
    {
        easy_exit_menu = _read_bool(field, easy_exit_menu);
    }
    else if (key == "dos_use_background_intensity")
    {
        dos_use_background_intensity = 
            _read_bool(field, dos_use_background_intensity);
    }

[13.420786]

[44.4636]

    else BOOL_OPTION(classic_item_colours);
    else BOOL_OPTION(item_colour);
    else BOOL_OPTION_NAMED("item_color", item_colour);
    else BOOL_OPTION(easy_exit_menu);
    else BOOL_OPTION(dos_use_background_intensity);

Deletion in crawl-ref/source/initfile.cc at line 2382 [7.2957258]
∅:D[45.5568] → [13.421746:421752]
∅:D[46.10676] → [13.421746:421752]
B:BD[7.2979021] → [13.421746:421752]
B:BD[13.421752] → [47.1229:1273]
B:BD[47.1273] → [16.13798:13858]
∅:D[16.13858] → [48.2686:2738]
B:BD[47.1332] → [48.2686:2738]
B:BD[48.2738] → [16.13859:13923]
∅:D[48.2801] → [47.1332:1338]
∅:D[16.13923] → [47.1332:1338]
B:BD[47.1332] → [47.1332:1338]
B:BD[47.1338] → [49.4406:4447]
B:BD[49.4447] → [16.13924:13978]
```
    }
    else if (key == "explore_greedy")
    {
        explore_greedy = _read_bool(field, explore_greedy);
    }
    else if (key == "explore_improved")
    {
        explore_improved = _read_bool(field, explore_improved);
    }
    else if (key == "trap_prompt")
    {
        trap_prompt = _read_bool(field, trap_prompt);
```

Insertion in crawl-ref/source/initfile.cc at line 2383 [7.2957258]

[49.4506]

[13.421774]

    else BOOL_OPTION(explore_greedy);
    else BOOL_OPTION(explore_improved);
    else BOOL_OPTION(trap_prompt);

Replacement in crawl-ref/source/initfile.cc at line 2448 [7.2957258]

B:BD[41.5260] → [41.5260:5363]

B:BD[41.5363] → [16.14108:14188]

∅:D[41.5442] → [50.3304:3310]

∅:D[16.14188] → [50.3304:3310]

B:BD[7.2979307] → [50.3304:3310]

B:BD[50.3310] → [41.5443:5540]

B:BD[41.5540] → [16.14189:14263]

∅:D[16.14263] → [41.5613:5619]

B:BD[41.5613] → [41.5613:5619]

    else if (key == "menu_colour_prefix_class" ||
             key == "menu_color_prefix_class")
    {
        menu_colour_prefix_class = _read_bool(field, menu_colour_prefix_class);
    }
    else if (key == "menu_colour_prefix_id" ||
             key == "menu_color_prefix_id")
    {
        menu_colour_prefix_id = _read_bool(field, menu_colour_prefix_id);
    }

[41.5260]

[50.3310]

    else BOOL_OPTION(menu_colour_prefix_class);
    else BOOL_OPTION_NAMED("menu_color_prefix_class", menu_colour_prefix_class);
    else BOOL_OPTION(menu_colour_prefix_id);
    else BOOL_OPTION_NAMED("menu_color_prefix_id", menu_colour_prefix_id);

Replacement in crawl-ref/source/initfile.cc at line 2527 [7.2957258]
B:BD[51.1531] → [51.1531:1576]
B:BD[51.1576] → [16.14322:14384]
∅:D[51.1630] → [13.425881:425887]
∅:D[36.14241] → [13.425881:425887]
∅:D[16.14384] → [13.425881:425887]
∅:D[17.811259] → [13.425881:425887]
B:BD[13.425881] → [13.425881:425887]
B:BD[13.426015] → [17.811349:811388]
∅:D[17.811388] → [13.426050:426056]
B:BD[13.426050] → [13.426050:426056]
B:BD[13.426056] → [16.14385:14447]
∅:D[16.14447] → [13.426125:426171]
∅:D[17.811450] → [13.426125:426171]
B:BD[13.426125] → [13.426125:426171]
B:BD[13.426171] → [16.14448:14500]
∅:D[16.14500] → [13.426238:426290]
∅:D[17.811502] → [13.426238:426290]
B:BD[13.426238] → [13.426238:426290]
B:BD[13.426290] → [16.14501:14565]
∅:D[16.14565] → [52.188:194]
B:BD[17.811566] → [52.188:194]
```
    else if (key == "level_map_title")
    {
        level_map_title = _read_bool(field, level_map_title);
    }
    else if (key == "target_zero_exp")
    {
        target_zero_exp = _read_bool(field, target_zero_exp);
    }
    else if (key == "target_oos")
    {
        target_oos = _read_bool(field, target_oos);
    }
    else if (key == "target_los_first")
    {
        target_los_first = _read_bool(field, target_los_first);
    }
```
[51.1531]
[52.194]
```
    else BOOL_OPTION(level_map_title);
    else BOOL_OPTION(target_zero_exp);
    else BOOL_OPTION(target_oos);
    else BOOL_OPTION(target_los_first);
```
Deletion in crawl-ref/source/initfile.cc at line 2561 [7.2957258]
∅:D[16.14812] → [14.5853988:5853994]
B:BD[14.5853988] → [14.5853988:5853994]
B:BD[14.5853994] → [16.14813:14854]
∅:D[16.14854] → [53.177373:177379]
B:BD[53.177373] → [53.177373:177379]
B:BD[53.177379] → [2.2628:2694]
```
    }
    else if (key == "tile_title_screen")
    {
        tile_title_screen = _read_bool(field, tile_title_screen);
```
Insertion in crawl-ref/source/initfile.cc at line 2562 [7.2957258]
[53.177440]
[54.6058]
```
    else BOOL_OPTION(tile_title_screen);
```
Replacement in crawl-ref/source/initfile.cc at line 2656 [7.2957258]
B:BD[14.5854020] → [53.177441:177477]
∅:D[53.177477] → [14.5854057:5854063]
B:BD[14.5854057] → [14.5854057:5854063]
B:BD[14.5854063] → [16.15665:15723]
∅:D[16.15723] → [14.5854120:5854126]
B:BD[14.5854120] → [14.5854120:5854126]
```
    else if (key == "use_dos_char")
    {
        use_dos_char = _read_bool( field, use_dos_char );
    }
```
[14.5854020]
[14.5854126]
```
    else BOOL_OPTION(use_dos_char);
```

Replacement in crawl-ref/source/externs.h at line 1550 [7.3270163]

B:BD[11.5476] → [11.5476:5512]

    bool        mlist_force_inline;

[11.5476]

[38.8694]

    bool        mlist_allow_alternate_layout;
    bool        classic_hud;

Replacement in crawl-ref/init.txt at line 213 [7.4830895]
B:BD[11.5885] → [5.2803:2831]
```
# mlist_force_inline = true
```
[11.5885]
[55.824]
```
# mlist_allow_alternate_layout = false
# classic_hud = false
```

Replacement in crawl-ref/docs/options_guide.txt at line 1071 [56.63392]

B:BD[11.7034] → [11.7034:7314]

mlist_force_inline = false
        By default, if the terminal size is large enough, the monster 
        list will be placed to the left of the view.  If this option is 
        set to true, the monster list will only appear between the 
        status hud and the message pane.

[11.7034]

[57.29581]

mlist_allow_alternate_layout = false
        If the terminal size is large enough, allow the monster list
        to be placed to the left of the view.  By default, the monster
        list will only appear beween the HUD and the message pane.
classic_hud = false
        Remove the Health and Magic bars and the monster list, for a
        more 0.3-like HUD display.

For FR 1934370

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/view.cc at line 4993 [7.16817]

Replacement in crawl-ref/source/view.cc at line 5179 [7.16817]

Insertion in crawl-ref/source/view.cc at line 5184 [7.16817]

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

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

Replacement in crawl-ref/source/initfile.cc at line 616 [7.2957258]

Insertion in crawl-ref/source/initfile.cc at line 1570 [7.2957258]

Replacement in crawl-ref/source/initfile.cc at line 1768 [7.2957258]

Deletion in crawl-ref/source/initfile.cc at line 1783 [7.2957258]

Replacement in crawl-ref/source/initfile.cc at line 1784 [7.2957258]

Deletion in crawl-ref/source/initfile.cc at line 1825 [7.2957258]

Replacement in crawl-ref/source/initfile.cc at line 1826 [7.2957258]

Replacement in crawl-ref/source/initfile.cc at line 1862 [7.2957258]

Replacement in crawl-ref/source/initfile.cc at line 1921 [7.2957258]

Deletion in crawl-ref/source/initfile.cc at line 1932 [7.2957258]

Insertion in crawl-ref/source/initfile.cc at line 1933 [7.2957258]

Replacement in crawl-ref/source/initfile.cc at line 1943 [7.2957258]

Replacement in crawl-ref/source/initfile.cc at line 2007 [7.2957258]

Deletion in crawl-ref/source/initfile.cc at line 2013 [7.2957258]

Insertion in crawl-ref/source/initfile.cc at line 2014 [7.2957258]

Replacement in crawl-ref/source/initfile.cc at line 2016 [7.2957258]

Replacement in crawl-ref/source/initfile.cc at line 2018 [7.2957258]

Replacement in crawl-ref/source/initfile.cc at line 2044 [7.2957258]

Replacement in crawl-ref/source/initfile.cc at line 2053 [7.2957258]

Deletion in crawl-ref/source/initfile.cc at line 2078 [7.2957258]

Insertion in crawl-ref/source/initfile.cc at line 2079 [7.2957258]

Replacement in crawl-ref/source/initfile.cc at line 2222 [7.2957258]

Replacement in crawl-ref/source/initfile.cc at line 2285 [7.2957258]

Replacement in crawl-ref/source/initfile.cc at line 2345 [7.2957258]

Deletion in crawl-ref/source/initfile.cc at line 2382 [7.2957258]

Insertion in crawl-ref/source/initfile.cc at line 2383 [7.2957258]

Replacement in crawl-ref/source/initfile.cc at line 2448 [7.2957258]

Replacement in crawl-ref/source/initfile.cc at line 2527 [7.2957258]

Deletion in crawl-ref/source/initfile.cc at line 2561 [7.2957258]

Insertion in crawl-ref/source/initfile.cc at line 2562 [7.2957258]

Replacement in crawl-ref/source/initfile.cc at line 2656 [7.2957258]

Replacement in crawl-ref/source/externs.h at line 1550 [7.3270163]

Replacement in crawl-ref/init.txt at line 213 [7.4830895]

Replacement in crawl-ref/docs/options_guide.txt at line 1071 [56.63392]