fiddlerwoaroof/crawl - Change QYUAYEGK7WPBJLZRSWZVDWD5SMNAWWIJSQPWYA7BEYXMEBD2SDKAC

Implement the results of the HUD discussion with maybe 80% accuracy.

I didn't do anything with changing how rot is displayed because it's a big bikeshed. For now, if there's rot you see "HP:" instead of "Health:" and I predict it'll be a long time before anyone complains (if ever)

show_turns=true shows Turn: but also Gold:, will maybe rename the option (having two options is not an option :). It gets the space by stealing from the monster list rather than pushing anything off the HUD; seems like a reasonable thing to do. The HUD feels too tight already IMO.

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

Created by pauldubois on April 19, 2008

QYUAYEGK7WPBJLZRSWZVDWD5SMNAWWIJSQPWYA7BEYXMEBD2SDKAC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/view.cc at line 4944 [6.16817]
B:BD[5.623] → [5.623:702]
∅:D[5.702] → [7.2701:2724]
B:BD[7.2701] → [7.2701:2724]
B:BD[7.2724] → [8.269:270]
```
//////////////////////////////////////////////////////////////////////////////
// crawl_view_geometry
```
Replacement in crawl-ref/source/view.cc at line 4953 [6.16817]
B:BD[9.202] → [10.33:81]
```
#  define HUD_WIDTH  42
#  define HUD_HEIGHT 13
```
[8.691]
[4.983]
```
#define HUD_WIDTH  42
#define HUD_HEIGHT 12
```
Replacement in crawl-ref/source/view.cc at line 4973 [6.16817]
B:BD[8.1189] → [8.1189:1222]
```
    _layout(coord_def termsz_) :
```
[8.1189]
[8.1222]
```
    _layout(coord_def termsz_, coord_def hudsz_) :
```
Replacement in crawl-ref/source/view.cc at line 4976 [6.16817]
B:BD[8.1326] → [8.1326:1379]
```
        hudp(-1,-1),   hudsz(HUD_WIDTH, HUD_HEIGHT),
```
[8.1326]
[8.1379]
```
        hudp(-1,-1),   hudsz(hudsz_),
```
Replacement in crawl-ref/source/view.cc at line 5007 [6.16817]
B:BD[8.2386] → [10.179:200]
```
    coord_def hudsz;
```
[8.2386]
[8.2444]
```
    const coord_def hudsz;
```

Replacement in crawl-ref/source/view.cc at line 5022 [6.16817]

B:BD[8.2674] → [8.2674:2740]

    _inline_layout(coord_def c) : _layout(c) { valid = _init(); }

[8.2674]

[8.2740]

    _inline_layout(coord_def termsz_, coord_def hudsz_) :
        _layout(termsz_, hudsz_)
    { valid = _init(); }

Replacement in crawl-ref/source/view.cc at line 5091 [6.16817]

B:BD[8.4719] → [8.4719:4788]

    _mlist_col_layout(coord_def c) : _layout(c) { valid = _init(); }

[8.4719]

[8.4788]

    _mlist_col_layout(coord_def termsz_, coord_def hudsz_)
        : _layout(termsz_, hudsz_)
    { valid = _init(); }

Insertion in crawl-ref/source/view.cc at line 5140 [6.16817]

[7.2916]

// ----------------------------------------------------------------------
// crawl_view_geometry
// ----------------------------------------------------------------------

Replacement in crawl-ref/source/view.cc at line 5147 [6.16817]
B:BD[8.6538] → [8.6538:6587]
```
      hudp(40, 1), hudsz(HUD_WIDTH, HUD_HEIGHT),
```
[8.6538]
[5.703]
```
      hudp(40, 1), hudsz(-1, -1),
```

Insertion in crawl-ref/source/view.cc at line 5221 [6.16817]

[7.5199]

[5.883]

    hudsz = coord_def(HUD_WIDTH, HUD_HEIGHT + (Options.show_turns ? 1 : 0));

Replacement in crawl-ref/source/view.cc at line 5223 [6.16817]

B:BD[5.884] → [8.6588:6680]

    const _inline_layout lay_inline(termsz);
    const _mlist_col_layout lay_mlist(termsz);

[5.884]

[11.823]

    const _inline_layout lay_inline(termsz, hudsz);
    const _mlist_col_layout lay_mlist(termsz, hudsz);

Replacement in crawl-ref/source/view.cc at line 5253 [6.16817]
B:BD[8.7350] → [8.7350:7397]
```
    // hudsz = winner->hudsz; size is constant
```
[8.7350]
[8.7397]
```
    hudsz = winner->hudsz;
```
Replacement in crawl-ref/source/player.cc at line 6617 [6.962854]
B:BD[12.224] → [12.224:259]
```
            return "Portal Vault";
```
[12.224]
[13.6834]
```
            return "Portal Chamber";
```
Replacement in crawl-ref/source/output.h at line 52 [6.1087719]
B:BD[11.4479] → [9.3563:3619]
```
void print_stats_level(const std::string& description);
```
[11.4479]
[9.3619]
```
void print_stats_level();
```
Insertion in crawl-ref/source/output.cc at line 27 [6.1088282]
[14.51906]
[15.1134]
```
#include "branch.h"
```
Insertion in crawl-ref/source/output.cc at line 45 [6.1088282]
[6.1088772]
[16.2540]
```
#include "place.h"
```
Replacement in crawl-ref/source/output.cc at line 230 [6.1088282]
B:BD[17.378] → [2.2538:2571]
```
    cgotoxy(19+6, 2, GOTO_STAT);
```
[17.378]
[17.550]
```
    cgotoxy(19+6, 9, GOTO_STAT);
```
Replacement in crawl-ref/source/output.cc at line 298 [6.1088282]
B:BD[18.2986] → [9.4486:4518]
```
    cgotoxy(x+7, y, GOTO_STAT);
```
[18.2986]
[18.3016]
```
    cgotoxy(x+8, y, GOTO_STAT);
```

Deletion in crawl-ref/source/output.cc at line 317 [6.1088282]

B:BD[18.3465] → [18.3465:3592]

    int hp_percent;
    if ( max_max_hp )
        hp_percent = (you.hp * 100) / max_max_hp;
    else
        hp_percent = 100;

Replacement in crawl-ref/source/output.cc at line 318 [6.1088282]

B:BD[19.5714] → [18.3593:3659]

    for ( unsigned int i = 0; i < Options.hp_colour.size(); ++i )

[19.5714]

[6.1089465]

    // Calculate colour
    short hp_colour = LIGHTGREY;

Replacement in crawl-ref/source/output.cc at line 321 [6.1088282]

B:BD[6.1089471] → [18.3660:3765]

        if ( i+1 == Options.hp_colour.size() ||
             hp_percent > Options.hp_colour[i+1].first )

[6.1089471]

[20.187]

        const int hp_percent =
            (you.hp * 100) / (max_max_hp ? max_max_hp : you.hp);
        for ( unsigned int i = 0; i < Options.hp_colour.size(); ++i )

Replacement in crawl-ref/source/output.cc at line 326 [6.1088282]

B:BD[20.197] → [18.3766:3837]

            textcolor(Options.hp_colour[i].second);
            break;

[20.197]

[20.417]

            if ( i+1 == Options.hp_colour.size() ||
                 hp_percent > Options.hp_colour[i+1].first )
            {
                hp_colour = Options.hp_colour[i].second;
                break;
            }

Replacement in crawl-ref/source/output.cc at line 335 [6.1088282]

B:BD[21.74] → [9.4665:4697]

B:BD[9.4697] → [22.11517:11542]

∅:D[23.2776] → [18.3876:3905]

∅:D[9.4725] → [18.3876:3905]

∅:D[22.11542] → [18.3876:3905]

B:BD[6.1089687] → [18.3876:3905]

    cgotoxy(x+4, y, GOTO_STAT);
    int col = -wherex();
    cprintf( "%d", you.hp );

[21.74]

[6.1089891]

    // 01234567890123456789
    // Health: xxx/yyy (zzz)
    cgotoxy(x, y, GOTO_STAT);
    textcolor(BROWN);
    cprintf(max_max_hp != you.hp_max ? "HP: " : "Health: ");

Insertion in crawl-ref/source/output.cc at line 341 [6.1088282]
[6.1089892]
[18.3906]
```
    textcolor(hp_colour);
    cprintf( "%d", you.hp );
```
Deletion in crawl-ref/source/output.cc at line 345 [6.1088282]
∅:D[18.3966] → [6.1089960:1089961]
B:BD[6.1089960] → [6.1089960:1089961]
Replacement in crawl-ref/source/output.cc at line 348 [6.1088282]
B:BD[6.1090044] → [23.2777:2798]
∅:D[23.2798] → [18.4107:4141]
∅:D[24.3746] → [18.4107:4141]
B:BD[18.4107] → [18.4107:4141]
B:BD[18.4141] → [24.3747:3793]
B:BD[24.3793] → [9.4751:4788]
```
    col += wherex();
    if (max_max_hp != you.hp_max)
        col += _count_digits(max_max_hp) + 3;
    for (int i = 14-col; i > 0; i--)
```
[6.1090044]
[18.4223]
```
    int col = wherex() - crawl_view.hudp.x;
    for (int i = 18-col; i > 0; i--)
```

Insertion in crawl-ref/source/output.cc at line 786 [6.1088282]

[10.11837]

    static int last_number_of_lights = 0;
    _get_status_lights(lights);
    if (lights.size() == 0 && last_number_of_lights == 0)
        return;

Deletion in crawl-ref/source/output.cc at line 793 [6.1088282]
B:BD[10.11912] → [10.11912:11936]
```
    size_t i_light = 0;
```
Deletion in crawl-ref/source/output.cc at line 794 [6.1088282]
B:BD[10.11937] → [10.11937:11969]
```
    _get_status_lights(lights);
```
Insertion in crawl-ref/source/output.cc at line 796 [6.1088282]
[10.12051]
[10.12051]
```
    size_t i_light = 0;
```
Replacement in crawl-ref/source/output.cc at line 851 [6.1088282]
B:BD[2.2655] → [2.2655:2687]
```
        cprintf("Exp level: ");
```
[2.2655]
[2.2687]
```
        cprintf("Exp Pool: ");
```
Deletion in crawl-ref/source/output.cc at line 853 [6.1088282]
B:BD[2.2717] → [2.2717:2762]
∅:D[2.2762] → [6.1100449:1100450]
∅:D[23.2898] → [6.1100449:1100450]
∅:D[9.7170] → [6.1100449:1100450]
∅:D[18.16803] → [6.1100449:1100450]
B:BD[6.1100449] → [6.1100449:1100450]
B:BD[6.1100450] → [2.2763:2904]
```
        cprintf("%d", you.experience_level);
        cgotoxy(19,8, GOTO_STAT);
        textcolor(Options.status_caption_colour);
        cprintf("Pool: ");
        textcolor(LIGHTGREY);
```
Replacement in crawl-ref/source/output.cc at line 854 [6.1088282]
B:BD[18.16826] → [2.2905:2935]
```
        cprintf("%d/%d (%d)",
```
[18.16826]
[2.2935]
```
        cprintf("%d/%d (%d) ",
```
Replacement in crawl-ref/source/output.cc at line 857 [6.1088282]
B:BD[18.16983] → [2.3010:3052]
```
        cprintf("%d", you.exp_available);
```
[18.16983]
[18.17092]
```
        cprintf("%-6d", you.exp_available);
```
Deletion in crawl-ref/source/output.cc at line 859 [6.1088282]
B:BD[6.1100594] → [18.17100:17132]
```
        clear_to_end_of_line();
```

Insertion in crawl-ref/source/output.cc at line 862 [6.1088282]

[16.3060]

    // If Options.show_turns, line 9 is Gold and Turns
    int yhack = 0;
    if (Options.show_turns)
    {
        yhack = 1;
        cgotoxy(1+6, 9, GOTO_STAT); cprintf("%d", you.gold);
    }

Replacement in crawl-ref/source/output.cc at line 882 [6.1088282]
B:BD[16.3733] → [16.3733:3762]
```
        _print_stats_wp(10);
```
[16.3733]
[16.3762]
```
        _print_stats_wp(9+yhack);
```
Replacement in crawl-ref/source/output.cc at line 887 [6.1088282]
B:BD[16.3822] → [16.3822:3851]
```
        _print_stats_qv(11);
```
[16.3822]
[16.3851]
```
        _print_stats_qv(10+yhack);
```
Replacement in crawl-ref/source/output.cc at line 895 [6.1088282]
B:BD[10.12982] → [10.12982:13016]
```
        _print_status_lights(12);
```
[10.12982]
[10.13016]
```
        _print_status_lights(11+yhack);
```

Insertion in crawl-ref/source/output.cc at line 901 [6.1088282]

[9.7430]

static std::string _level_description_string_hud()
{
    const PlaceInfo& place = you.get_place_info();
    std::string short_name = place.short_name();
    if (place.level_type == LEVEL_DUNGEON
        && branches[place.branch].depth > 1)
    {
        short_name += make_stringf(":%d", player_branch_depth());
    }
    // Indefinite articles
    else if (  place.level_type == LEVEL_PORTAL_VAULT
            || place.level_type == LEVEL_LABYRINTH)
    {
        if (you.level_type_name == "bazaar")
            short_name = "A Bazaar";
        else
            short_name.insert(0, "A ");
    }
    // Definite articles
    else if (place.level_type == LEVEL_ABYSS)
    {
        short_name.insert(0, "The ");
    }
    return short_name;
}

Replacement in crawl-ref/source/output.cc at line 929 [6.1088282]
B:BD[9.7484] → [9.7484:7539]
```
void print_stats_level(const std::string& description)
```
[9.7484]
[9.7539]
```
void print_stats_level()
```

Replacement in crawl-ref/source/output.cc at line 931 [6.1088282]

B:BD[9.7541] → [23.3296:3326]

    cgotoxy(7, 9, GOTO_STAT);

[9.7541]

[9.7572]

    textcolor(BROWN);
    cgotoxy(19, 8, GOTO_STAT);
    cprintf("Level: ");

Replacement in crawl-ref/source/output.cc at line 939 [6.1088282]
B:BD[9.7671] → [9.7671:7711]
```
    cprintf("%s", description.c_str());
```
[9.7671]
[9.7711]
```
    cprintf("%s", _level_description_string_hud().c_str());
```
Insertion in crawl-ref/source/output.cc at line 964 [6.1088282]
[23.4055]
[23.4055]
```
    // Line 1: Foo the Bar    *WIZARD*
```
Deletion in crawl-ref/source/output.cc at line 966 [6.1088282]
B:BD[23.4085] → [23.4085:4086]
Insertion in crawl-ref/source/output.cc at line 967 [6.1088282]
[23.4111]
[3.2583]
```
    if (title.size() > WIDTH)
        title.resize(WIDTH, ' ');
```
Deletion in crawl-ref/source/output.cc at line 970 [6.1088282]
∅:D[3.2628] → [23.4150:4259]
B:BD[23.4150] → [23.4150:4259]
```
    cgotoxy(1, 2, GOTO_STAT);
    cprintf("%s", species_name( you.species, you.experience_level ).c_str());
```

Replacement in crawl-ref/source/output.cc at line 973 [6.1088282]

B:BD[23.4317] → [23.4317:4374]

        cgotoxy(1 + crawl_view.hudsz.x-9, 2, GOTO_STAT);

[23.4317]

[23.4374]

        cgotoxy(1 + crawl_view.hudsz.x-9, 1, GOTO_STAT);

Insertion in crawl-ref/source/output.cc at line 976 [6.1088282]

[23.4410]


    // Line 2:
    // Level N Minotaur [of God]
    textcolor( YELLOW );
    cgotoxy(1, 2, GOTO_STAT);
    cprintf("Level %d %s",
            you.experience_level,
            species_name( you.species, you.experience_level ).c_str());
    if (you.religion != GOD_NO_GOD)
        cprintf(" of %s", god_name(you.religion).c_str());

Replacement in crawl-ref/source/output.cc at line 998 [6.1088282]
B:BD[25.2589] → [9.8084:8131]
```
    cgotoxy( 1, 3, GOTO_STAT); cprintf("HP:");
```
[25.2589]
[9.8131]
```
    //cgotoxy( 1, 3, GOTO_STAT); cprintf("Hp:");
```
Deletion in crawl-ref/source/output.cc at line 1003 [6.1088282]
B:BD[9.8325] → [2.3053:3110]
```
    // cgotoxy( 1, 8, GOTO_STAT); cprintf("Exp level:");
```
Replacement in crawl-ref/source/output.cc at line 1007 [6.1088282]
B:BD[9.8571] → [2.3111:3162]
```
    //cgotoxy(19, 8, GOTO_STAT); cprintf("Pool:");
```
[9.8571]
[9.8571]
```
    // Line 8 is exp pool, Level
```

Replacement in crawl-ref/source/output.cc at line 1011 [6.1088282]

B:BD[9.8605] → [2.3163:3216]

        cgotoxy(19, 2, GOTO_STAT); cprintf("Turn:");

[9.8605]

[9.8658]

        cgotoxy( 1, 9, GOTO_STAT); cprintf("Gold:");
        cgotoxy(19, 9, GOTO_STAT); cprintf("Turn:");

Deletion in crawl-ref/source/output.cc at line 1014 [6.1088282]
B:BD[9.8664] → [9.8664:8690]
B:BD[9.8690] → [23.4499:4547]
```
    textcolor(LIGHTGREY);
    cgotoxy( 1,9, GOTO_STAT); cprintf("Level");
```
Deletion in crawl-ref/source/misc.h at line 60 [6.1928926]
B:BD[6.1931977] → [26.530:571]
```
std::string level_description_string();
```

Deletion in crawl-ref/source/misc.cc at line 2287 [6.1933596]

∅:D[27.297] → [28.398:401]

B:BD[28.398] → [28.398:401]

∅:D[28.401] → [26.573:612]

B:BD[29.6622] → [26.573:612]

∅:D[26.612] → [6.1959408:1959410]

B:BD[6.1959408] → [6.1959408:1959410]

B:BD[6.1959410] → [26.613:837]

B:BD[26.837] → [30.1882:1928]

B:BD[30.1928] → [31.331:417]

B:BD[31.417] → [32.19362:19363]

∅:D[32.19363] → [31.431:475]

B:BD[31.431] → [31.431:475]

∅:D[31.475] → [33.10342:10343]

∅:D[30.1965] → [33.10342:10343]

B:BD[33.10342] → [33.10342:10343]

∅:D[33.10343] → [26.837:1270]

B:BD[26.837] → [26.837:1270]

}
std::string level_description_string()
{
    if (you.level_type == LEVEL_PANDEMONIUM)
        return "- Pandemonium";
    if (you.level_type == LEVEL_ABYSS)
        return "- The Abyss";
    if (you.level_type == LEVEL_LABYRINTH)
        return "- a Labyrinth";
    if (you.level_type == LEVEL_PORTAL_VAULT)
    {
         if (you.level_type_name == "bazaar")
             return "- a Bazaar";
         return "- a Portal Chamber";
    }
    // level_type == LEVEL_DUNGEON
    char buf[200];
    const int youbranch = you.where_are_you;
    if ( branches[youbranch].depth == 1 )
        snprintf(buf, sizeof buf, "- %s", branches[youbranch].longname);
    else
    {
        const int curr_subdungeon_level = player_branch_depth();
        snprintf(buf, sizeof buf, "%d of %s", curr_subdungeon_level,
                 branches[youbranch].longname);
    }
    return buf;

Deletion in crawl-ref/source/misc.cc at line 2288 [6.1933596]
∅:D[26.1272] → [6.1959462:1959463]
∅:D[34.8454] → [6.1959462:1959463]
B:BD[6.1959462] → [6.1959462:1959463]
Replacement in crawl-ref/source/misc.cc at line 2292 [6.1933596]
B:BD[35.545780] → [9.8845:8896]
```
    print_stats_level(level_description_string());
```
[35.545780]
[36.668]
```
    print_stats_level();
```

Replacement in crawl-ref/source/externs.h at line 502 [6.3270163]

B:BD[13.14324] → [13.14324:14360]

    int level_type;
    int branch;

[13.14324]

[13.14360]

    int level_type;     // enum level_area_type
    int branch;         // enum branch_type if LEVEL_DUNGEON; otherwise -1

Replacement in crawl-ref/source/direct.h at line 48 [6.3696722]

B:BD[37.96113] → [8.10205:10268]

    const coord_def hudsz;         // Size of the status area.

[37.96113]

[37.96176]

    coord_def hudsz;               // Size of the status area.

Implement the results of the HUD discussion with maybe 80% accuracy.

Dependencies

In channels

Change contents

Deletion in crawl-ref/source/view.cc at line 4944 [6.16817]

Replacement in crawl-ref/source/view.cc at line 4953 [6.16817]

Replacement in crawl-ref/source/view.cc at line 4973 [6.16817]

Replacement in crawl-ref/source/view.cc at line 4976 [6.16817]

Replacement in crawl-ref/source/view.cc at line 5007 [6.16817]

Replacement in crawl-ref/source/view.cc at line 5022 [6.16817]

Replacement in crawl-ref/source/view.cc at line 5091 [6.16817]

Insertion in crawl-ref/source/view.cc at line 5140 [6.16817]

Replacement in crawl-ref/source/view.cc at line 5147 [6.16817]

Insertion in crawl-ref/source/view.cc at line 5221 [6.16817]

Replacement in crawl-ref/source/view.cc at line 5223 [6.16817]

Replacement in crawl-ref/source/view.cc at line 5253 [6.16817]

Replacement in crawl-ref/source/player.cc at line 6617 [6.962854]

Replacement in crawl-ref/source/output.h at line 52 [6.1087719]

Insertion in crawl-ref/source/output.cc at line 27 [6.1088282]

Insertion in crawl-ref/source/output.cc at line 45 [6.1088282]

Replacement in crawl-ref/source/output.cc at line 230 [6.1088282]

Replacement in crawl-ref/source/output.cc at line 298 [6.1088282]

Deletion in crawl-ref/source/output.cc at line 317 [6.1088282]

Replacement in crawl-ref/source/output.cc at line 318 [6.1088282]

Replacement in crawl-ref/source/output.cc at line 321 [6.1088282]

Replacement in crawl-ref/source/output.cc at line 326 [6.1088282]

Replacement in crawl-ref/source/output.cc at line 335 [6.1088282]

Insertion in crawl-ref/source/output.cc at line 341 [6.1088282]

Deletion in crawl-ref/source/output.cc at line 345 [6.1088282]

Replacement in crawl-ref/source/output.cc at line 348 [6.1088282]

Insertion in crawl-ref/source/output.cc at line 786 [6.1088282]

Deletion in crawl-ref/source/output.cc at line 793 [6.1088282]

Deletion in crawl-ref/source/output.cc at line 794 [6.1088282]

Insertion in crawl-ref/source/output.cc at line 796 [6.1088282]

Replacement in crawl-ref/source/output.cc at line 851 [6.1088282]

Deletion in crawl-ref/source/output.cc at line 853 [6.1088282]

Replacement in crawl-ref/source/output.cc at line 854 [6.1088282]

Replacement in crawl-ref/source/output.cc at line 857 [6.1088282]

Deletion in crawl-ref/source/output.cc at line 859 [6.1088282]

Insertion in crawl-ref/source/output.cc at line 862 [6.1088282]

Replacement in crawl-ref/source/output.cc at line 882 [6.1088282]

Replacement in crawl-ref/source/output.cc at line 887 [6.1088282]

Replacement in crawl-ref/source/output.cc at line 895 [6.1088282]

Insertion in crawl-ref/source/output.cc at line 901 [6.1088282]

Replacement in crawl-ref/source/output.cc at line 929 [6.1088282]

Replacement in crawl-ref/source/output.cc at line 931 [6.1088282]

Replacement in crawl-ref/source/output.cc at line 939 [6.1088282]

Insertion in crawl-ref/source/output.cc at line 964 [6.1088282]

Deletion in crawl-ref/source/output.cc at line 966 [6.1088282]

Insertion in crawl-ref/source/output.cc at line 967 [6.1088282]

Deletion in crawl-ref/source/output.cc at line 970 [6.1088282]

Replacement in crawl-ref/source/output.cc at line 973 [6.1088282]

Insertion in crawl-ref/source/output.cc at line 976 [6.1088282]

Replacement in crawl-ref/source/output.cc at line 998 [6.1088282]

Deletion in crawl-ref/source/output.cc at line 1003 [6.1088282]

Replacement in crawl-ref/source/output.cc at line 1007 [6.1088282]

Replacement in crawl-ref/source/output.cc at line 1011 [6.1088282]

Deletion in crawl-ref/source/output.cc at line 1014 [6.1088282]

Deletion in crawl-ref/source/misc.h at line 60 [6.1928926]

Deletion in crawl-ref/source/misc.cc at line 2287 [6.1933596]

Deletion in crawl-ref/source/misc.cc at line 2288 [6.1933596]

Replacement in crawl-ref/source/misc.cc at line 2292 [6.1933596]

Replacement in crawl-ref/source/externs.h at line 502 [6.3270163]

Replacement in crawl-ref/source/direct.h at line 48 [6.3696722]