fiddlerwoaroof/crawl - Change KEANRIMF5CGFVZ2XJYNFPOAKLXOSOJUOVA73IWBWOG576265ERHAC

FR 1962016: Make hydra headedness more obvious.

        You now get messages like &quot;The seven-headed hydra bites.&quot; 
        and &quot;You slice the 12-headed hydra.&quot;

FR 1963606: Take a note when you pick up a rune (or the Orb!) for the first time.

There are a couple of other files I changed, but I can't remember any big stuff, so it was probably just cleanup.

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

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

KEANRIMF5CGFVZ2XJYNFPOAKLXOSOJUOVA73IWBWOG576265ERHAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/travel.cc at line 147 [7.39949]

B:BD[7.43920] → [7.43920:43979]

// Returns true if this feature takes extra time to cross.

[7.43920]

[8.758]

// Returns an estimate for the time needed to cross this feature.
// This is done, so traps etc. will usually be circumvented where possible.

Insertion in crawl-ref/source/travel.cc at line 416 [7.39949]
[9.7355]
[10.593]

Replacement in crawl-ref/source/travel.cc at line 418 [7.39949]

∅:D[10.619] → [7.49589:49658]

B:BD[7.49589] → [7.49589:49658]

B:BD[7.49658] → [10.620:697]

    return (grid == DNGN_DEEP_WATER || grid == DNGN_SHALLOW_WATER ||
            grid == DNGN_LAVA || is_trap(x, y) || is_monster_blocked(x, y));

[10.619]

[7.49708]

    return (grid == DNGN_DEEP_WATER || grid == DNGN_SHALLOW_WATER
            || grid == DNGN_LAVA || is_trap(x, y) || is_monster_blocked(x, y));

Replacement in crawl-ref/source/travel.cc at line 457 [7.39949]

B:BD[7.51925] → [11.375:485]

∅:D[11.485] → [7.52038:52097]

B:BD[7.52038] → [7.52038:52097]

             ||
                (is_trap(x, y) &&
                 clua.callbooleanfn(false, "ch_cross_trap",
                                    "s", trap_name(x, y)))

[7.51925]

[7.52097]

                || (is_trap(x, y)
                    && clua.callbooleanfn(false, "ch_cross_trap",
                                          "s", trap_name(x, y)))

Replacement in crawl-ref/source/travel.cc at line 462 [7.39949]
B:BD[7.52118] → [12.3872:3914]
```
        && !is_excluded(coord_def(x, y));
```
[7.52118]
[7.52153]
```
            && !is_excluded(coord_def(x, y));
```
Insertion in crawl-ref/source/travel.cc at line 492 [7.39949]
[8.1177]
[8.1177]
```
    {
```
Insertion in crawl-ref/source/travel.cc at line 494 [7.39949]
[8.1201]
[11.542]
```
    }
```

Replacement in crawl-ref/source/travel.cc at line 1697 [7.39949]

B:BD[12.4453] → [12.4453:4514]

∅:D[12.4514] → [9.20152:20177]

B:BD[9.20152] → [9.20152:20177]

                is_excluded(dc)       ? PD_EXCLUDED_RADIUS :
                PD_TRAP;

[12.4453]

[13.4466]

                is_excluded(dc)       ? PD_EXCLUDED_RADIUS
                                      : PD_TRAP;

Replacement in crawl-ref/source/traps.cc at line 385 [14.5308]

B:BD[14.14170] → [14.14170:14247]

                        + (random2(you.dex) / 3) + (trap_known ? 3 : 0) > 8)

[14.14170]

[14.14247]

                 + (random2(you.dex) / 3) + (trap_known ? 3 : 0) > 8)

Replacement in crawl-ref/source/traps.cc at line 405 [14.5308]

B:BD[14.14761] → [14.14761:14839]

                        + (random2(you.dex) / 3) + (trap_known ? 3 : 0) > 12)

[14.14761]

[14.14839]

                + (random2(you.dex) / 3) + (trap_known ? 3 : 0) > 12)

Replacement in crawl-ref/source/traps.cc at line 450 [14.5308]
B:BD[15.1012] → [15.1012:1041]
```
        if (!you.do_shaft())
```
[15.1012]
[16.422]
```
        if (!you.do_shaft() && !trap_known)
```

Replacement in crawl-ref/source/traps.cc at line 452 [14.5308]

∅:D[16.432] → [15.1041:1190]

B:BD[15.1041] → [15.1041:1190]

            if (!trap_known)
            {
                grd[you.x_pos][you.y_pos] = DNGN_UNDISCOVERED_TRAP;
                return;
            }

[16.432]

[16.433]

            grd[you.x_pos][you.y_pos] = DNGN_UNDISCOVERED_TRAP;
            return;

Replacement in crawl-ref/source/traps.cc at line 471 [14.5308]
∅:D[17.481] → [14.15758:15812]
B:BD[14.15758] → [14.15758:15812]
```
}                               // end handle_traps()
```
[17.481]
[18.234]
```
}
```

Replacement in crawl-ref/source/traps.cc at line 528 [14.5308]

B:BD[14.16748] → [14.16748:16872]

            if (env.trap[i].type == TRAP_NET &&
                (env.trap[i].x != you.x_pos || env.trap[i].y != you.y_pos))

[14.16748]

[14.16872]

            if (env.trap[i].type == TRAP_NET
                && (env.trap[i].x != you.x_pos || env.trap[i].y != you.y_pos))

Replacement in crawl-ref/source/player.cc at line 105 [20.962854]
B:BD[19.337283] → [19.337283:337317]
```
// stepped - normal walking moves
```
[19.337283]
[19.337317]
```
// stepped     - normal walking moves
```

Replacement in crawl-ref/source/player.cc at line 107 [20.962854]

B:BD[19.337389] → [19.337389:337460]

// force - ignore safety checks, move must happen (traps, lava/water).

[19.337389]

[19.337460]

// force       - ignore safety checks, move must happen (traps, lava/water).

Replacement in crawl-ref/source/player.cc at line 117 [20.962854]

∅:D[8.4602] → [19.337834:337901]

B:BD[19.337834] → [19.337834:337901]

                                      : grd[you.x_pos][you.y_pos];

[8.4602]

[8.4603]

                                            : grd[you.x_pos][you.y_pos];

Replacement in crawl-ref/source/player.cc at line 131 [20.962854]

B:BD[21.2812] → [21.2812:2875]

        // don't prompt if already in a cloud of the same type

[21.2812]

[21.2875]

        // Don't prompt if already in a cloud of the same type.

Replacement in crawl-ref/source/player.cc at line 149 [20.962854]
∅:D[21.3465] → [19.338336:338395]
B:BD[19.338336] → [19.338336:338395]
```
    // if we're walking along, give a chance to avoid trap
```
[21.3465]
[2.181]
```
    // If we're walking along, give a chance to avoid traps.
```
Insertion in crawl-ref/source/player.cc at line 163 [20.962854]
[22.725]
[4.2784]
Replacement in crawl-ref/source/player.cc at line 177 [20.962854]
B:BD[22.1028] → [22.1028:1054]
```
        } // unknown trap
```
[22.1028]
[23.693]
```
        }
```

Replacement in crawl-ref/source/player.cc at line 301 [20.962854]

B:BD[24.5747150] → [24.5747150:5747275]

    if ((!grid_is_water(new_grid) && grid_is_water(old_grid) ||
        grid_is_water(new_grid) && !grid_is_water(old_grid))

[24.5747150]

[24.5747275]

    if ((!grid_is_water(new_grid) && grid_is_water(old_grid)
         || grid_is_water(new_grid) && !grid_is_water(old_grid))

Replacement in crawl-ref/source/player.cc at line 339 [20.962854]

B:BD[19.342550] → [19.342550:342619]

            // not easy to blink onto a trap without setting it off:

[19.342550]

[19.342619]

            // It's not easy to blink onto a trap without setting it off.

Replacement in crawl-ref/source/player.cc at line 344 [20.962854]
B:BD[25.2587] → [25.2587:2626]
```
	    // player is flying or levitating
```
[25.2587]
[26.731]
```
            // player is flying or levitating
```

Replacement in crawl-ref/source/player.cc at line 2696 [20.962854]

B:BD[20.1003990] → [26.905:980]

    int cap = 3500+(you.strength * 100)+(player_is_airborne() ? 1000 : 0);

[20.1003990]

[27.241]

    int cap = 3500 + (you.strength * 100) + (player_is_airborne() ? 1000 : 0);

Replacement in crawl-ref/source/player.cc at line 6222 [20.962854]

B:BD[28.568] → [28.568:1007]

    return airborne() &&
        (permanent_flight() ||
         // Boots of levitation keep you with DUR_LEVITATION >= 2 at
         // all times. This is so that you can evoke stop-levitation
         // in order to actually cancel levitation (by setting
         // DUR_LEVITATION to 1.) Note that antimagic() won't do this.
         (player_equip_ego_type( EQ_BOOTS, SPARM_LEVITATION ) &&
          you.duration[DUR_LEVITATION] > 1));

[28.568]

[28.1007]

    // Boots of levitation keep you with DUR_LEVITATION >= 2 at
    // all times. This is so that you can evoke stop-levitation
    // in order to actually cancel levitation (by setting
    // DUR_LEVITATION to 1.) Note that antimagic() won't do this.
    return (airborne()
            && (permanent_flight()
                || player_equip_ego_type( EQ_BOOTS, SPARM_LEVITATION )
                   && you.duration[DUR_LEVITATION] > 1));

Replacement in crawl-ref/source/player.cc at line 6234 [20.962854]

B:BD[28.1050] → [28.1050:1140]

    return airborne() &&
        (you.species == SP_KENKU && you.experience_level >= 15);

[28.1050]

[28.1140]

    return (airborne()
            && you.species == SP_KENKU && you.experience_level >= 15);

Insertion in crawl-ref/source/notes.h at line 49 [19.368326]
[29.1443]
[19.369698]
```
    NOTE_FOUND_ORB_OR_RUNE,     /* needs: item name (string) */
```
Replacement in crawl-ref/source/notes.cc at line 37 [19.370339]
B:BD[30.6517] → [30.6517:6568]
```
static int real_god_power( int religion, int idx )
```
[30.6517]
[30.6568]
```
static int _real_god_power( int religion, int idx )
```

Replacement in crawl-ref/source/notes.cc at line 39 [19.370339]

B:BD[30.6570] → [30.6570:6628]

    if ( god_gain_power_messages[religion][idx][0] == 0 )

[30.6570]

[30.6628]

    if (god_gain_power_messages[religion][idx][0] == 0)

Insertion in crawl-ref/source/notes.cc at line 41 [19.370339]
[30.6647]
[30.6647]

Replacement in crawl-ref/source/notes.cc at line 43 [19.370339]

B:BD[30.6666] → [30.6666:6757]

    for ( int j = 0; j < idx; ++j )
        if ( god_gain_power_messages[religion][j][0] )

[30.6666]

[30.6757]

    for (int j = 0; j < idx; ++j)
        if (god_gain_power_messages[religion][j][0])

Insertion in crawl-ref/source/notes.cc at line 46 [19.370339]
[30.6778]
[30.6778]
Replacement in crawl-ref/source/notes.cc at line 50 [19.370339]
B:BD[19.371600] → [31.73092:73143]
```
static bool is_noteworthy_skill_level( int level )
```
[19.371600]
[31.73143]
```
static bool _is_noteworthy_skill_level( int level )
```

Replacement in crawl-ref/source/notes.cc at line 52 [19.370339]

B:BD[31.73145] → [32.178:252]

∅:D[32.252] → [33.6182:6235]

B:BD[19.371730] → [33.6182:6235]

    for ( unsigned int i = 0; i < Options.note_skill_levels.size(); ++i )
        if ( level == Options.note_skill_levels[i] )

[31.73145]

[33.6235]

    for (unsigned int i = 0; i < Options.note_skill_levels.size(); ++i)
        if (level == Options.note_skill_levels[i])

Insertion in crawl-ref/source/notes.cc at line 55 [19.370339]
[33.6260]
[19.371794]
Replacement in crawl-ref/source/notes.cc at line 59 [19.370339]
B:BD[19.371815] → [31.73146:73188]
```
static bool is_highest_skill( int skill )
```
[19.371815]
[31.73188]
```
static bool _is_highest_skill( int skill )
```
Replacement in crawl-ref/source/notes.cc at line 71 [19.370339]
B:BD[19.372026] → [31.73240:73290]
```
static bool is_noteworthy_hp( int hp, int maxhp )
```
[19.372026]
[31.73290]
```
static bool _is_noteworthy_hp( int hp, int maxhp )
```

Replacement in crawl-ref/source/notes.cc at line 73 [19.370339]

∅:D[31.73292] → [19.372078:372127]

B:BD[19.372078] → [19.372078:372127]

B:BD[19.372127] → [33.6386:6446]

    return (hp > 0 && Options.note_hp_percent &&
            hp <= (maxhp * Options.note_hp_percent) / 100);

[31.73292]

[19.372180]

    return (hp > 0 && Options.note_hp_percent
            && hp <= (maxhp * Options.note_hp_percent) / 100);

Replacement in crawl-ref/source/notes.cc at line 77 [19.370339]
B:BD[19.372183] → [31.73293:73349]
```
static int dungeon_branch_depth( unsigned char branch )
```
[19.372183]
[31.73349]
```
static int _dungeon_branch_depth( unsigned char branch )
```
Replacement in crawl-ref/source/notes.cc at line 84 [19.370339]
B:BD[19.372644] → [31.73352:73409]
```
static bool is_noteworthy_dlevel( unsigned short place )
```
[19.372644]
[31.73409]
```
static bool _is_noteworthy_dlevel( unsigned short place )
```
Replacement in crawl-ref/source/notes.cc at line 91 [19.370339]
B:BD[19.372874] → [19.372874:372897]
```
    if ( lev == 0xFF )
```
[19.372874]
[33.6447]
```
    if (lev == 0xFF)
```

Replacement in crawl-ref/source/notes.cc at line 93 [19.370339]

∅:D[33.6468] → [19.372911:372964]

B:BD[19.372911] → [19.372911:372964]

B:BD[19.372964] → [33.6469:6586]

    
    if ( lev == dungeon_branch_depth(branch) ||
         (branch == BRANCH_MAIN_DUNGEON && (lev % 5) == 0) ||
         (branch != BRANCH_MAIN_DUNGEON && lev == 1) )

[33.6468]

[33.6586]


    if (lev == _dungeon_branch_depth(branch)
        || branch == BRANCH_MAIN_DUNGEON && (lev % 5) == 0
        || branch != BRANCH_MAIN_DUNGEON && lev == 1)
    {

Insertion in crawl-ref/source/notes.cc at line 99 [19.370339]
[33.6607]
[19.373081]
```
    }
```

Replacement in crawl-ref/source/notes.cc at line 104 [19.370339]

B:BD[19.373103] → [19.373103:373241]

B:BD[19.373241] → [31.73412:73458]

/* Is a note worth taking?
   This function assumes that game state has not changed since
   the note was taken, e.g. you.* is valid.
 */
static bool is_noteworthy( const Note& note )

[19.373103]

[31.73458]

// Is a note worth taking?
// This function assumes that game state has not changed since
// the note was taken, e.g. you.* is valid.
static bool _is_noteworthy( const Note& note )

Replacement in crawl-ref/source/notes.cc at line 110 [19.370339]

B:BD[19.373318] → [19.373318:373364]

B:BD[19.373364] → [33.6608:6772]

B:BD[33.6772] → [34.178:255]

∅:D[34.255] → [19.373500:373543]

∅:D[33.6772] → [19.373500:373543]

B:BD[19.373500] → [19.373500:373543]

B:BD[19.373543] → [33.6773:6816]

∅:D[33.6816] → [19.373579:373622]

B:BD[19.373579] → [19.373579:373622]

B:BD[19.373622] → [33.6817:6857]

∅:D[33.6857] → [19.373655:373693]

B:BD[19.373655] → [19.373655:373693]

B:BD[19.373693] → [33.6858:6897]

B:BD[33.6897] → [35.1169:1207]

∅:D[35.1207] → [29.1445:1522]

B:BD[33.6897] → [29.1445:1522]

    if ( note.type == NOTE_XP_LEVEL_CHANGE ||
         note.type == NOTE_GET_GOD ||
         note.type == NOTE_GOD_GIFT ||
         note.type == NOTE_GET_MUTATION ||
         note.type == NOTE_LOSE_MUTATION ||
         note.type == NOTE_GET_ITEM ||
         note.type == NOTE_ID_ITEM ||
         note.type == NOTE_SEEN_MONSTER ||
         note.type == NOTE_KILL_MONSTER ||
         note.type == NOTE_POLY_MONSTER ||
         note.type == NOTE_USER_NOTE ||
         note.type == NOTE_MESSAGE ||
         note.type == NOTE_LOSE_GOD ||
         note.type == NOTE_PENANCE ||
         note.type == NOTE_MOLLIFY_GOD ||
         note.type == NOTE_DEATH )

[19.373318]

[33.6898]

    if (note.type == NOTE_XP_LEVEL_CHANGE
        || note.type == NOTE_GET_GOD
        || note.type == NOTE_GOD_GIFT
        || note.type == NOTE_GET_MUTATION
        || note.type == NOTE_LOSE_MUTATION
        || note.type == NOTE_GET_ITEM
        || note.type == NOTE_ID_ITEM
        || note.type == NOTE_SEEN_MONSTER
        || note.type == NOTE_KILL_MONSTER
        || note.type == NOTE_POLY_MONSTER
        || note.type == NOTE_USER_NOTE
        || note.type == NOTE_MESSAGE
        || note.type == NOTE_FOUND_ORB_OR_RUNE
        || note.type == NOTE_LOSE_GOD
        || note.type == NOTE_PENANCE
        || note.type == NOTE_MOLLIFY_GOD
        || note.type == NOTE_DEATH)
    {

Replacement in crawl-ref/source/notes.cc at line 129 [19.370339]
∅:D[33.6919] → [36.366:371]
B:BD[19.373738] → [36.366:371]
```
    
```
[33.6919]
[19.373739]
```
    }
```

Replacement in crawl-ref/source/notes.cc at line 132 [19.370339]

B:BD[19.373799] → [37.3988:4028]

∅:D[37.4028] → [33.6960:7045]

B:BD[33.6960] → [33.6960:7045]

    if ( note.type == NOTE_MP_CHANGE ||
         note.type == NOTE_MAXHP_CHANGE ||
         note.type == NOTE_MAXMP_CHANGE )

[19.373799]

[33.7045]

    if (note.type == NOTE_MP_CHANGE
        || note.type == NOTE_MAXHP_CHANGE
        || note.type == NOTE_MAXMP_CHANGE)
    {

Insertion in crawl-ref/source/notes.cc at line 137 [19.370339]
[33.7067]
[19.373957]
```
    }
```

Replacement in crawl-ref/source/notes.cc at line 140 [19.370339]

B:BD[19.374023] → [19.374023:374063]

B:BD[19.374063] → [33.7068:7125]

    if ( note.type == NOTE_GOD_POWER &&
         real_god_power(note.first, note.second) == -1 )

[19.374023]

[33.7125]

    if (note.type == NOTE_GOD_POWER
        && _real_god_power(note.first, note.second) == -1)
    {

Insertion in crawl-ref/source/notes.cc at line 144 [19.370339]
[33.7147]
[19.374128]
```
    }
```

Replacement in crawl-ref/source/notes.cc at line 147 [19.370339]

B:BD[19.374188] → [19.374188:374228]

B:BD[19.374228] → [33.7148:7202]

    if ( note.type == NOTE_HP_CHANGE &&
         !is_noteworthy_hp(note.first, note.second) )

[19.374188]

[38.1236]

    if (note.type == NOTE_HP_CHANGE
        && !_is_noteworthy_hp(note.first, note.second))

Replacement in crawl-ref/source/notes.cc at line 155 [19.370339]
B:BD[19.374411] → [39.61:101]
```
    if ( note.type == NOTE_GAIN_SKILL )
```
[19.374411]
[39.101]
```
    if (note.type == NOTE_GAIN_SKILL)
```

Replacement in crawl-ref/source/notes.cc at line 157 [19.370339]

B:BD[39.107] → [40.217:287]

∅:D[40.287] → [33.7225:7374]

B:BD[39.107] → [33.7225:7374]

        if ( Options.note_all_skill_levels )
            return true;
        if ( is_noteworthy_skill_level(note.second) )
            return true;
        if ( Options.note_skill_max && is_highest_skill(note.first) )

[39.107]

[33.7374]

        if (Options.note_all_skill_levels
            || _is_noteworthy_skill_level(note.second)
            || Options.note_skill_max && _is_highest_skill(note.first))
        {

Insertion in crawl-ref/source/notes.cc at line 162 [19.370339]
[33.7399]
[33.7399]
```
        }
```
Replacement in crawl-ref/source/notes.cc at line 166 [19.370339]
B:BD[39.109] → [39.109:159]
```
    if ( note.type == NOTE_DUNGEON_LEVEL_CHANGE )
```
[39.109]
[39.159]
```
    if (note.type == NOTE_DUNGEON_LEVEL_CHANGE)
```

Replacement in crawl-ref/source/notes.cc at line 168 [19.370339]

B:BD[39.165] → [39.165:233]

        if ( !is_noteworthy_dlevel(note.packed_place) )

[39.165]

[39.233]

        if (!_is_noteworthy_dlevel(note.packed_place))

Insertion in crawl-ref/source/notes.cc at line 170 [19.370339]
[39.259]
[39.259]

Replacement in crawl-ref/source/notes.cc at line 172 [19.370339]

B:BD[39.304] → [39.304:414]

        if ( (note.packed_place & 0xFF) == 0xFF &&
             (note.packed_place >> 8) == LEVEL_LABYRINTH )

[39.304]

[39.414]

        if ((note.packed_place & 0xFF) == 0xFF
            && (note.packed_place >> 8) == LEVEL_LABYRINTH)
        {

Insertion in crawl-ref/source/notes.cc at line 176 [19.370339]
[39.439]
[39.439]
```
        }
```
Replacement in crawl-ref/source/notes.cc at line 178 [19.370339]
∅:D[39.445] → [19.374736:374741]
B:BD[19.374736] → [19.374736:374741]
```
    
```
[39.445]
[19.374741]

Replacement in crawl-ref/source/notes.cc at line 180 [19.370339]

B:BD[19.374815] → [19.374815:374883]

    if ( note.type == NOTE_LEARN_SPELL && Options.note_all_spells )

[19.374815]

[33.7422]

    if (note.type == NOTE_LEARN_SPELL && Options.note_all_spells)

Replacement in crawl-ref/source/notes.cc at line 183 [19.370339]
B:BD[19.374898] → [31.73461:73515]
```
    for ( unsigned i = 0; i < note_list.size(); ++i )
```
[19.374898]
[31.73515]
```
    for (unsigned i = 0; i < note_list.size(); ++i)
```
Replacement in crawl-ref/source/notes.cc at line 185 [19.370339]
B:BD[31.73521] → [33.7444:7490]
```
        if ( note_list[i].type != note.type )
```
[31.73521]
[33.7490]
```
        if (note_list[i].type != note.type)
```
Insertion in crawl-ref/source/notes.cc at line 187 [19.370339]
[33.7512]
[33.7512]
Replacement in crawl-ref/source/notes.cc at line 189 [19.370339]
B:BD[33.7555] → [33.7555:7584]
```
        switch ( note.type )
```
[33.7555]
[31.73544]
```
        switch (note.type)
```

Replacement in crawl-ref/source/notes.cc at line 192 [19.370339]

B:BD[33.7625] → [33.7625:7684]

            if ( rnote.packed_place == note.packed_place )

[33.7625]

[33.7684]

            if (rnote.packed_place == note.packed_place)

Replacement in crawl-ref/source/notes.cc at line 196 [19.370339]

B:BD[33.7764] → [41.13824:13969]

            if (spell_difficulty(static_cast<spell_type>(rnote.first)) >=
                spell_difficulty(static_cast<spell_type>(note.first)))

[33.7764]

[41.13969]

            if (spell_difficulty(static_cast<spell_type>(rnote.first))
                >= spell_difficulty(static_cast<spell_type>(note.first)))

Replacement in crawl-ref/source/notes.cc at line 203 [19.370339]

B:BD[33.7921] → [33.7921:7997]

            if ( rnote.first == note.first && rnote.second == note.second )

[33.7921]

[33.7997]

            if (rnote.first == note.first && rnote.second == note.second)

Replacement in crawl-ref/source/notes.cc at line 207 [19.370339]

B:BD[33.8289] → [33.8289:8503]

            /* not if we have a recent warning */
            if ( (note.turn - rnote.turn < 5) &&
                 /* unless we've lost half our HP since then */
                 (note.first * 2 >= rnote.first) )

[33.8289]

[33.8503]

            // Not if we have a recent warning
            // unless we've lost half our HP since then.
            if (note.turn - rnote.turn < 5
                && note.first * 2 >= rnote.first)
            {

Insertion in crawl-ref/source/notes.cc at line 213 [19.370339]
[33.8533]
[33.8533]
```
            }
```
Replacement in crawl-ref/source/notes.cc at line 225 [19.370339]
B:BD[19.376081] → [32.253:304]
```
static const char* number_to_ordinal( int number )
```
[19.376081]
[31.73599]
```
static const char* _number_to_ordinal( int number )
```

Replacement in crawl-ref/source/notes.cc at line 227 [19.370339]

∅:D[31.73601] → [19.376127:376197]

B:BD[19.376127] → [19.376127:376197]

B:BD[19.376197] → [33.8570:8613]

∅:D[33.8613] → [19.376212:376233]

B:BD[19.376212] → [19.376212:376233]

    const char* ordinals[5] = { "first", "second", "third", "fourth",
                                "fifth" };
    if ( number < 1)

[31.73601]

[33.8614]

    const char* ordinals[5] = { "first", "second", "third", "fourth", "fifth" };
    if (number < 1)

Replacement in crawl-ref/source/notes.cc at line 231 [19.370339]
∅:D[33.8662] → [19.376274:376296]
B:BD[19.376274] → [19.376274:376296]
```
    if ( number > 5 )
```
[33.8662]
[33.8663]
```
    if (number > 5)
```
Replacement in crawl-ref/source/notes.cc at line 241 [19.370339]
B:BD[42.9224] → [42.9224:9240]
```
    if ( when )
```
[42.9224]
[43.191]
```
    if (when)
```
Replacement in crawl-ref/source/notes.cc at line 244 [19.370339]
∅:D[44.384] → [42.9345:9362]
B:BD[19.379399] → [42.9345:9362]
```
    if ( where )
```
[44.384]
[42.9362]
```
    if (where)
```
Replacement in crawl-ref/source/notes.cc at line 250 [19.370339]
∅:D[44.498] → [42.9587:9603]
B:BD[42.9587] → [42.9587:9603]
```
    if ( what )
```
[44.498]
[42.9603]
```
    if (what)
```

Replacement in crawl-ref/source/notes.cc at line 328 [19.370339]

∅:D[45.35857] → [44.1874:1947]

B:BD[44.1874] → [44.1874:1947]

                   << number_to_ordinal(real_god_power(first, second)+1)

[45.35857]

[44.1947]

                   << _number_to_ordinal(_real_god_power(first, second)+1)

Insertion in crawl-ref/source/notes.cc at line 343 [19.370339]

[29.1576]

            break;
        case NOTE_FOUND_ORB_OR_RUNE:
            result << "Found " << name;

Replacement in crawl-ref/source/notes.cc at line 391 [19.370339]
B:BD[46.1254] → [46.1254:1267]
```
            
```
[46.1254]
[46.1267]

Replacement in crawl-ref/source/notes.cc at line 394 [19.370339]

B:BD[46.1361] → [46.1361:1415]

            else if (dep == dungeon_branch_depth(br))

[46.1361]

[46.1415]

            else if (dep == _dungeon_branch_depth(br))

Replacement in crawl-ref/source/notes.cc at line 399 [19.370339]
B:BD[46.1641] → [46.1641:1658]
```
                
```
[46.1641]
[44.2358]
Replacement in crawl-ref/source/notes.cc at line 433 [19.370339]
B:BD[19.380524] → [31.73829:73854]
```
bool notes_are_active() 
```
[19.380524]
[31.73854]
```
bool notes_are_active()
```
Replacement in crawl-ref/source/notes.cc at line 440 [19.370339]
∅:D[31.73906] → [47.167:225]
B:BD[47.167] → [47.167:225]
```
    if ( notes_active && (force || is_noteworthy(note)) )
```
[31.73906]
[46.1917]
```
    if ( notes_active && (force || _is_noteworthy(note)) )
```
Replacement in crawl-ref/source/notes.cc at line 447 [19.370339]
B:BD[19.380697] → [31.73907:73943]
```
void activate_notes( bool active ) 
```
[19.380697]
[31.73943]
```
void activate_notes( bool active )
```
Replacement in crawl-ref/source/notes.cc at line 452 [19.370339]
B:BD[19.380764] → [48.9838:9869]
```
void save_notes(writer& outf) 
```
[19.380764]
[31.73975]
```
void save_notes(writer& outf)
```
Replacement in crawl-ref/source/notes.cc at line 460 [19.370339]
B:BD[19.380957] → [48.9997:10027]
```
void load_notes(reader& inf) 
```
[19.380957]
[31.74007]
```
void load_notes(reader& inf)
```

Replacement in crawl-ref/source/mstuff2.cc at line 653 [20.1340842]

B:BD[5.14929] → [5.14929:14989]

                mgen_data( summon_any_demon(DEMON_LESSER),

[5.14929]

[5.14989]

                mgen_data( summon_any_demon(DEMON_LESSER),

Replacement in crawl-ref/source/mstuff2.cc at line 695 [20.1340842]

B:BD[5.15612] → [5.15612:15664]

                mgen_data(MONS_WANDERING_MUSHROOM,

[5.15612]

[5.15664]

                mgen_data(MONS_WANDERING_MUSHROOM,

Replacement in crawl-ref/source/mstuff2.cc at line 738 [20.1340842]

B:BD[5.15863] → [5.15863:15923]

                mgen_data(summon_any_demon(DEMON_GREATER),

[5.15863]

[5.15923]

                mgen_data(summon_any_demon(DEMON_GREATER),

Replacement in crawl-ref/source/mstuff2.cc at line 741 [20.1340842]

B:BD[5.16009] → [5.16009:16052]

                          monster->pos(),

[5.16009]

[5.16052]

                          monster->pos(),

Replacement in crawl-ref/source/mstuff2.cc at line 1117 [20.1340842]

B:BD[20.1364843] → [20.1364843:1364948]

    pbolt.range = 4;
    pbolt.rangeMax = 13;
    pbolt.damage = dice_def( 3, (monster->hit_dice * 2) );

[20.1364843]

[19.401959]

    pbolt.range       = 4;
    pbolt.rangeMax    = 13;
    pbolt.damage      = dice_def( 3, (monster->hit_dice * 2) );

Replacement in crawl-ref/source/mstuff2.cc at line 1121 [20.1340842]
B:BD[19.402018] → [49.2650:2697]
∅:D[49.2697] → [20.1364974:1364994]
B:BD[20.1364974] → [20.1364974:1364994]
```
    pbolt.type = dchar_glyph(DCHAR_FIRED_ZAP);
    pbolt.hit = 30;
```
[19.402018]
[20.1364994]
```
    pbolt.type        = dchar_glyph(DCHAR_FIRED_ZAP);
    pbolt.hit         = 30;
```
Replacement in crawl-ref/source/mstuff2.cc at line 1124 [20.1340842]
B:BD[20.1365042] → [20.1365042:1365072]
B:BD[20.1365072] → [19.402019:402045]
```
    pbolt.thrower = KILL_MON;
    pbolt.is_beam = true;
```
[20.1365042]
[50.7396]
```
    pbolt.thrower     = KILL_MON;
    pbolt.is_beam     = true;
```

Replacement in crawl-ref/source/mstuff2.cc at line 1127 [20.1340842]

∅:D[50.7397] → [51.9285:9465]

B:BD[52.3589] → [51.9285:9465]

∅:D[51.9580] → [52.3724:3774]

B:BD[52.3724] → [52.3724:3774]

B:BD[52.3774] → [51.9581:9639]

    // accuracy is halved if the dragon is attacking a target that's
    // wielding a weapon of dragon slaying (which makes the
    // dragon/draconian avoid looking at the foe).
    if ((mons_genus(monster->type) == MONS_DRAGON
         || mons_genus(monster->type) == MONS_DRACONIAN))

[50.7397]

[52.3961]

    // Accuracy is lowered by one quarter if the dragon is attacking a
    // a target thatis wielding a weapon of dragon slaying (which
    // makes the dragon/draconian avoid looking at the foe).
    // FIXME: This effect is not yet implemented for player draconians
    // or characters in dragon form breathing at monsters wielding a
    // weapon with this brand.
    if (mons_genus(monster->type) == MONS_DRAGON
        || mons_genus(monster->type) == MONS_DRACONIAN)

Replacement in crawl-ref/source/mstuff2.cc at line 1144 [20.1340842]
B:BD[3.2628] → [3.2628:2632]
```
		}
```
[3.2628]
[51.9872]
```
                }
```
Replacement in crawl-ref/source/mstuff2.cc at line 1156 [20.1340842]
B:BD[20.1365320] → [49.2698:2749]
```
    pbolt.type = dchar_glyph(DCHAR_FIRED_MISSILE);
```
[20.1365320]
[20.1365350]
```
    pbolt.type    = dchar_glyph(DCHAR_FIRED_MISSILE);
```

Replacement in crawl-ref/source/mon-util.cc at line 733 [20.1699344]

B:BD[50.10813] → [6.2574:2654]

    if ((attk_number < 0 || attk_number > 3) || mons->has_hydra_multi_attack())

[50.10813]

[53.9892]

    if (attk_number < 0 || attk_number > 3 || mons->has_hydra_multi_attack())

Insertion in crawl-ref/source/mon-util.cc at line 1691 [20.1699344]

[5.41966]

[51.14322]

        break;
    case MONS_HYDRA:
        if (mon.number < 1 || desc == DESC_PLAIN || desc == DESC_DBNAME)
            break;
        if (mon.number < 11)
        {
            result += (mon.number ==  1) ? "one"   :
                      (mon.number ==  2) ? "two"   :
                      (mon.number ==  3) ? "three" :
                      (mon.number ==  4) ? "four"  :
                      (mon.number ==  5) ? "five"  :
                      (mon.number ==  6) ? "six"   :
                      (mon.number ==  7) ? "seven" :
                      (mon.number ==  8) ? "eight" :
                      (mon.number ==  9) ? "nine"
                                         : "ten";
        }
        else
        {
            snprintf(info, INFO_SIZE, "%d", mon.number);
            result += info;
        }
        result += "-headed ";

Replacement in crawl-ref/source/mon-util.cc at line 4575 [20.1699344]

B:BD[5.42099] → [5.42099:42203]

    return (type == MONS_HYDRA ||
            (mons_is_zombified(this) && base_monster == MONS_HYDRA));

[5.42099]

[5.42203]

    return (type == MONS_HYDRA
            || (mons_is_zombified(this) && base_monster == MONS_HYDRA));

Replacement in crawl-ref/source/misc.cc at line 1163 [20.1933596]

B:BD[54.428] → [54.428:507]

∅:D[54.507] → [20.1937427:1937433]

B:BD[20.1937427] → [20.1937427:1937433]

B:BD[20.1937433] → [54.508:587]

    for ( int srx = you.x_pos - max_dist; srx <= you.x_pos + max_dist; ++srx )
    {
        for ( int sry=you.y_pos - max_dist; sry<=you.y_pos + max_dist; ++sry )

[54.428]

[20.1937495]

    for (int srx = you.x_pos - max_dist; srx <= you.x_pos + max_dist; ++srx)
        for (int sry = you.y_pos - max_dist; sry <= you.y_pos + max_dist; ++sry)

Replacement in crawl-ref/source/misc.cc at line 1167 [20.1933596]
B:BD[55.11756] → [55.11756:11802]
```
            if ( see_grid_no_trans(srx,sry) )
```
[55.11756]
[20.1937995]
```
            if (see_grid_no_trans(srx, sry))
```

Replacement in crawl-ref/source/misc.cc at line 1179 [20.1933596]

∅:D[56.269] → [54.1083:1186]

B:BD[54.1083] → [54.1083:1186]

                if (grd[srx][sry] == DNGN_SECRET_DOOR &&
                    random2(17) <= effective)

[56.269]

[54.1186]

                if (grd[srx][sry] == DNGN_SECRET_DOOR
                    && random2(17) <= effective)

Replacement in crawl-ref/source/misc.cc at line 1184 [20.1933596]

B:BD[54.1311] → [54.1311:1381]

                    exercise(SK_TRAPS_DOORS, ((coinflip()) ? 2 : 1));

[54.1311]

[54.1381]

                    exercise(SK_TRAPS_DOORS, (coinflip() ? 2 : 1));

Replacement in crawl-ref/source/misc.cc at line 1186 [20.1933596]

∅:D[54.1399] → [20.1938150:1938151]

B:BD[20.1938150] → [20.1938150:1938151]

B:BD[20.1938151] → [54.1400:1509]


                if (grd[srx][sry] == DNGN_UNDISCOVERED_TRAP &&
                    random2(17) <= effective)

[54.1399]

[54.1509]

                else if (grd[srx][sry] == DNGN_UNDISCOVERED_TRAP
                         && random2(17) <= effective)

Replacement in crawl-ref/source/misc.cc at line 1195 [20.1933596]

B:BD[57.275] → [17.2905:2979]

                        exercise(SK_TRAPS_DOORS, ((coinflip()) ? 2 : 1));

[57.275]

                        exercise(SK_TRAPS_DOORS, (coinflip() ? 2 : 1));

Deletion in crawl-ref/source/misc.cc at line 1210 [20.1933596]
B:BD[20.1938217] → [20.1938217:1938223]
```
    }
```

Replacement in crawl-ref/source/misc.cc at line 1441 [20.1933596]

B:BD[26.1671] → [26.1671:1741]

∅:D[26.1741] → [58.1159:1208]

B:BD[58.1159] → [58.1159:1208]

                                     (player_is_airborne()? "float" :
                                      "slide"));

[26.1671]

[58.1208]

                                     (player_is_airborne()? "float" : "slide"));

Replacement in crawl-ref/source/misc.cc at line 1470 [20.1933596]

B:BD[59.9249] → [60.214:308]

    if (!(old_level_type != you.level_type
          || you.entry_cause == EC_UNKNOWN))
    {

[59.9249]

[59.9291]

    if (old_level_type == you.level_type && you.entry_cause != EC_UNKNOWN)

Deletion in crawl-ref/source/misc.cc at line 1472 [20.1933596]
B:BD[59.9307] → [60.309:315]
```
    }
```

Replacement in crawl-ref/source/misc.cc at line 1581 [20.1933596]

B:BD[61.18804] → [61.18804:18853]

∅:D[61.18853] → [62.216:271]

B:BD[20.1944534] → [62.216:271]

        && (stair_find >= DNGN_STONE_STAIRS_UP_I
            && stair_find <= DNGN_STONE_STAIRS_UP_III)

[61.18804]

[20.1944584]

        && stair_find >= DNGN_STONE_STAIRS_UP_I
        && stair_find <= DNGN_STONE_STAIRS_UP_III

Replacement in crawl-ref/source/misc.cc at line 2008 [20.1933596]

B:BD[19.545550] → [63.2276:2343]

                                          you.level_type, false );

[19.545550]

[20.1955711]

                                          you.level_type, false);

Insertion in crawl-ref/source/items.cc at line 1451 [20.2584728]

[64.6370]

[7.354182]

    take_note(Note(NOTE_FOUND_ORB_OR_RUNE, 0, 0,
                   item.name(DESC_NOCAP_A).c_str()));

Insertion in crawl-ref/source/items.cc at line 1612 [20.2584728]

[7.355038]

        // Take a note!
        take_note(Note(NOTE_FOUND_ORB_OR_RUNE, 0, 0,
                       item.name(DESC_NOCAP_A).c_str()));

Deletion in crawl-ref/source/directn.cc at line 2073 [20.3697945]

B:BD[65.10302] → [65.10302:10303]

B:BD[65.10303] → [5.51330:51472]

∅:D[5.51472] → [66.1042:1104]

B:BD[67.2499] → [66.1042:1104]

∅:D[66.1104] → [67.2546:2589]

B:BD[67.2546] → [67.2546:2589]


    // XXX: Not strictly correct if we add any other monster with a
    // variable number of attacks.
    if (mon->has_hydra_multi_attack())
        mprf(MSGCH_EXAMINE, "It has %d head%s.", mon->number,
             (mon->number > 1? "s" : ""));

Insertion in crawl-ref/source/describe.cc at line 515 [20.3736416]
[68.2837]
[69.1658]
```
    // allow a couple of synonyms
```

Replacement in crawl-ref/source/describe.cc at line 520 [20.3736416]

B:BD[70.13361] → [15.23260:23362]

    else if (s == "nonteleport" || s == "noteleport" || s == "nontele"
             || s == "notele")

[70.13361]

[15.23362]

    else if (s == "nonteleport" || s == "noteleport"
             || s == "nontele" || s == "notele")
    {

Insertion in crawl-ref/source/describe.cc at line 524 [20.3736416]
[15.23397]
[70.13361]
```
    }
```
Deletion in crawl-ref/source/describe.cc at line 527 [20.3736416]
B:BD[70.13402] → [70.13402:13408]
```
    {
```
Deletion in crawl-ref/source/describe.cc at line 529 [20.3736416]
B:BD[70.13464] → [70.13464:13470]
```
    }
```

Replacement in crawl-ref/source/command.cc at line 57 [20.4082507]

∅:D[71.3229] → [20.4083330:4083397]

B:BD[20.4083330] → [20.4083330:4083397]

B:BD[20.4083397] → [19.1185897:1186013]

static void adjust_spells(void);
static void adjust_ability(void);
static void list_wizard_commands();
#ifdef OBSOLETE_COMMAND_HELP
static const char *command_string( int i );
#endif

[71.3229]

[20.4083397]

static void _adjust_spells(void);
static void _adjust_ability(void);
static void _list_wizard_commands();

Replacement in crawl-ref/source/command.cc at line 110 [20.4082507]
B:BD[20.4083914] → [20.4083914:4083939]
```
        adjust_spells();
```
[20.4083914]
[20.4083939]
```
        _adjust_spells();
```
Replacement in crawl-ref/source/command.cc at line 112 [20.4082507]
B:BD[20.4083966] → [20.4083966:4083992]
```
        adjust_ability();
```
[20.4083966]
[20.4083992]
```
        _adjust_ability();
```
Replacement in crawl-ref/source/command.cc at line 189 [20.4082507]
B:BD[7.480937] → [71.3318:3372]
```
}                               // end _adjust_item()
```
[7.480937]
[20.4085549]
```
}
```
Replacement in crawl-ref/source/command.cc at line 191 [20.4082507]
B:BD[20.4085655] → [20.4085655:4085687]
```
static void adjust_spells(void)
```
[20.4085550]
[20.4085687]
```
static void _adjust_spells(void)
```
Replacement in crawl-ref/source/command.cc at line 262 [20.4082507]
∅:D[72.25524] → [20.4088429:4088484]
B:BD[20.4088429] → [20.4088429:4088484]
```
}                               // end adjust_spells()
```
[72.25524]
[20.4088484]
```
}                               // end _adjust_spells()
```
Replacement in crawl-ref/source/command.cc at line 264 [20.4082507]
B:BD[20.4088485] → [20.4088485:4088518]
```
static void adjust_ability(void)
```
[20.4088485]
[20.4088518]
```
static void _adjust_ability(void)
```
Replacement in crawl-ref/source/command.cc at line 362 [20.4082507]
B:BD[73.3122] → [73.3122:3124]
```
}
```
[73.3122]
[20.4090884]
```
}                               // end _adjust_ability()
```
Replacement in crawl-ref/source/command.cc at line 541 [20.4082507]
B:BD[19.1186813] → [19.1186813:1186868]
```
static bool cmdhelp_textfilter(const std::string &tag)
```
[19.1186813]
[19.1186868]
```
static bool _cmdhelp_textfilter(const std::string &tag)
```

Replacement in crawl-ref/source/command.cc at line 597 [20.4082507]

B:BD[74.1905] → [74.1905:2042]

static void add_file_to_scroller(FILE* fp, formatted_scroller& m,
                                 int first_hotkey, bool auto_hotkeys )

[74.1905]

[74.2042]

static void _add_file_to_scroller(FILE* fp, formatted_scroller& m,
                                  int first_hotkey, bool auto_hotkeys )

Replacement in crawl-ref/source/command.cc at line 660 [20.4082507]

B:BD[75.4796] → [76.3191:3261]

static bool compare_mon_names(MenuEntry *entry_a, MenuEntry* entry_b)

[75.4796]

[75.4862]

static bool _compare_mon_names(MenuEntry *entry_a, MenuEntry* entry_b)

Replacement in crawl-ref/source/command.cc at line 675 [20.4082507]
∅:D[77.3768] → [76.3705:3779]
B:BD[76.3705] → [76.3705:3779]
```
static bool compare_mon_toughness(MenuEntry *entry_a, MenuEntry* entry_b)
```
[77.3768]
[76.3779]
```
static bool _compare_mon_toughness(MenuEntry *entry_a, MenuEntry* entry_b)
```

Replacement in crawl-ref/source/command.cc at line 739 [20.4082507]

B:BD[76.5272] → [76.5272:5346]

                std::sort(items.begin(), items.end(), compare_mon_names);

[76.5272]

[76.5346]

                std::sort(items.begin(), items.end(), _compare_mon_names);

Replacement in crawl-ref/source/command.cc at line 741 [20.4082507]

B:BD[76.5363] → [76.5363:5441]

                std::sort(items.begin(), items.end(), compare_mon_toughness);

[76.5363]

[76.5441]

                std::sort(items.begin(), items.end(), _compare_mon_toughness);

Replacement in crawl-ref/source/command.cc at line 764 [20.4082507]

B:BD[75.6231] → [76.5885:6019]

static std::vector<std::string> get_desc_keys(std::string regex,
                                              db_find_filter filter)

[75.6231]

[75.6290]

static std::vector<std::string> _get_desc_keys(std::string regex,
                                               db_find_filter filter)

Deletion in crawl-ref/source/command.cc at line 790 [20.4082507]
B:BD[75.7360] → [75.7360:7370]
```
        {
```
Deletion in crawl-ref/source/command.cc at line 791 [20.4082507]
B:BD[75.7413] → [75.7413:7423]
```
        }
```

Replacement in crawl-ref/source/command.cc at line 795 [20.4082507]

B:BD[75.7631] → [76.6476:6549]

static std::vector<std::string> get_monster_keys(unsigned char showchar)

[75.7631]

[75.7691]

static std::vector<std::string> _get_monster_keys(unsigned char showchar)

Replacement in crawl-ref/source/command.cc at line 822 [20.4082507]
B:BD[78.6271] → [78.6271:6318]
```
static std::vector<std::string> get_god_keys()
```
[78.6271]
[78.6318]
```
static std::vector<std::string> _get_god_keys()
```
Replacement in crawl-ref/source/command.cc at line 836 [20.4082507]
B:BD[78.6553] → [78.6553:6603]
```
static std::vector<std::string> get_branch_keys()
```
[78.6553]
[78.6603]
```
static std::vector<std::string> _get_branch_keys()
```

Replacement in crawl-ref/source/command.cc at line 855 [20.4082507]

B:BD[75.8362] → [76.6576:6638]

static bool monster_filter(std::string key, std::string body)

[75.8362]

[76.6638]

static bool _monster_filter(std::string key, std::string body)

Replacement in crawl-ref/source/command.cc at line 861 [20.4082507]

B:BD[75.8693] → [76.6714:6774]

static bool spell_filter(std::string key, std::string body)

[75.8693]

[79.1816]

static bool _spell_filter(std::string key, std::string body)

Replacement in crawl-ref/source/command.cc at line 866 [20.4082507]
B:BD[80.51404] → [80.51404:51463]
```
static bool item_filter(std::string key, std::string body)
```
[80.51404]
[80.51463]
```
static bool _item_filter(std::string key, std::string body)
```

Replacement in crawl-ref/source/command.cc at line 871 [20.4082507]

B:BD[79.1862] → [76.6829:6891]

static bool feature_filter(std::string key, std::string body)

[79.1862]

[76.6891]

static bool _feature_filter(std::string key, std::string body)

Replacement in crawl-ref/source/command.cc at line 878 [20.4082507]
B:BD[80.51641] → [80.51641:51700]
```
static void recap_mon_keys(std::vector<std::string> &keys)
```
[80.51641]
[80.51700]
```
static void _recap_mon_keys(std::vector<std::string> &keys)
```

Replacement in crawl-ref/source/command.cc at line 887 [20.4082507]

B:BD[79.2066] → [80.51895:51955]

static void recap_feat_keys(std::vector<std::string> &keys)

[79.2066]

[80.51955]

static void _recap_feat_keys(std::vector<std::string> &keys)

Replacement in crawl-ref/source/command.cc at line 902 [20.4082507]

B:BD[80.52192] → [81.362:431]

static bool do_description(std::string key, std::string footer = "")

[80.52192]

[76.7065]

static bool _do_description(std::string key, std::string footer = "")

Replacement in crawl-ref/source/command.cc at line 972 [20.4082507]

B:BD[76.7157] → [82.3686:3754]

static bool find_description(bool &again, std::string& error_inout)

[76.7157]

[76.7188]

static bool _find_description(bool &again, std::string& error_inout)

Replacement in crawl-ref/source/command.cc at line 1002 [20.4082507]

∅:D[78.7409] → [76.7539:7567]

B:BD[76.7539] → [76.7539:7567]

B:BD[76.7567] → [78.7410:7447]

B:BD[78.7447] → [80.52372:52409]

            "that symbol.";
        filter     = monster_filter;
        recap      = recap_mon_keys;

[78.7409]

[78.7447]

                     "that symbol.";
        filter     = _monster_filter;
        recap      = _recap_mon_keys;

Replacement in crawl-ref/source/command.cc at line 1009 [20.4082507]
B:BD[76.7655] → [76.7655:7686]
```
        filter = spell_filter;
```
[76.7655]
[76.7686]
```
        filter = _spell_filter;
```

Replacement in crawl-ref/source/command.cc at line 1013 [20.4082507]

B:BD[80.52454] → [80.52454:52592]

        extra      = "  Enter a single letter to list items displayed by "
            "that symbol.";
        filter      = item_filter;

[80.52454]

[80.52592]

        extra       = "  Enter a single letter to list items displayed by "
                      "that symbol.";
        filter      = _item_filter;

Replacement in crawl-ref/source/command.cc at line 1020 [20.4082507]

B:BD[76.7743] → [76.7743:7776]

B:BD[76.7776] → [80.52636:52670]

        filter = feature_filter;
        recap  = recap_feat_keys;

[76.7743]

[78.7475]

        filter = _feature_filter;
        recap  = _recap_feat_keys;

Replacement in crawl-ref/source/command.cc at line 1091 [20.4082507]
B:BD[76.8805] → [76.8805:8852]
```
        key_list = get_monster_keys(regex[0]);
```
[76.8805]
[80.52796]
```
        key_list = _get_monster_keys(regex[0]);
```
Replacement in crawl-ref/source/command.cc at line 1095 [20.4082507]
B:BD[78.8577] → [78.8577:8612]
```
        key_list = get_god_keys();
```
[78.8577]
[78.8612]
```
        key_list = _get_god_keys();
```
Replacement in crawl-ref/source/command.cc at line 1097 [20.4082507]
B:BD[78.8641] → [78.8641:8679]
```
        key_list = get_branch_keys();
```
[78.8641]
[76.8852]
```
        key_list = _get_branch_keys();
```
Replacement in crawl-ref/source/command.cc at line 1099 [20.4082507]
B:BD[76.8861] → [76.8861:8910]
```
        key_list = get_desc_keys(regex, filter);
```
[76.8861]
[80.52881]
```
        key_list = _get_desc_keys(regex, filter);
```
Replacement in crawl-ref/source/command.cc at line 1144 [20.4082507]
B:BD[76.9974] → [76.9974:10024]
B:BD[76.10024] → [81.840:846]
```
    {
        return do_description(key_list[0]);
    }
```
[76.9974]
[81.846]
```
        return _do_description(key_list[0]);
```
Replacement in crawl-ref/source/command.cc at line 1152 [20.4082507]
B:BD[81.1031] → [81.1031:1075]
```
        if (!do_description(regex, footer))
```
[81.1031]
[81.1075]
```
        if (!_do_description(regex, footer))
```

Replacement in crawl-ref/source/command.cc at line 1230 [20.4082507]

B:BD[76.11870] → [76.11870:11907]

            if (do_description(key))

[76.11870]

[76.11907]

            if (_do_description(key))
            {

Insertion in crawl-ref/source/command.cc at line 1234 [20.4082507]
[76.11972]
[76.11972]
```
            }
```
Replacement in crawl-ref/source/command.cc at line 1241 [20.4082507]
∅:D[79.3234] → [83.2090:2127]
B:BD[83.2090] → [83.2090:2127]
```
static int keyhelp_keyfilter(int ch)
```
[79.3234]
[83.2127]
```
static int _keyhelp_keyfilter(int ch)
```

Replacement in crawl-ref/source/command.cc at line 1261 [20.4082507]

B:BD[84.28756] → [84.28756:28821]

            if (find_description(again, error) && getch() == 0 )

[84.28756]

[84.28821]

            if (_find_description(again, error) && getch() == 0 )

Replacement in crawl-ref/source/command.cc at line 1318 [20.4082507]

∅:D[83.2250] → [74.2753:2827]

B:BD[85.1150] → [74.2753:2827]

B:BD[74.2827] → [86.5005:5123]

static void show_keyhelp_menu(const std::vector<formatted_string> &lines,
                              bool with_manual, bool easy_exit = false,
                              int hotkey = 0)

[83.2250]

[19.1188079]

static void _show_keyhelp_menu(const std::vector<formatted_string> &lines,
                               bool with_manual, bool easy_exit = false,
                               int hotkey = 0)

Replacement in crawl-ref/source/command.cc at line 1340 [20.4082507]
∅:D[87.8077] → [83.2458:2508]
B:BD[83.2458] → [83.2458:2508]
```
        cmd_help.f_keyfilter = keyhelp_keyfilter;
```
[87.8077]
[88.779]
```
        cmd_help.f_keyfilter = _keyhelp_keyfilter;
```
Replacement in crawl-ref/source/command.cc at line 1364 [20.4082507]
B:BD[88.1138] → [88.1138:1183]
```
            true, true, cmdhelp_textfilter);
```
[88.1138]
[88.1183]
```
            true, true, _cmdhelp_textfilter);
```
Replacement in crawl-ref/source/command.cc at line 1390 [20.4082507]
∅:D[88.2151] → [83.2983:3028]
∅:D[89.4018] → [83.2983:3028]
B:BD[83.2983] → [83.2983:3028]
```
            true, true, cmdhelp_textfilter);
```
[89.4018]
[84.28893]
```
            true, true, _cmdhelp_textfilter);
```

Replacement in crawl-ref/source/command.cc at line 1422 [20.4082507]

B:BD[83.3769] → [83.3769:3899]

            add_file_to_scroller(fp, cmd_help, help_files[i].hotkey,
                                 help_files[i].auto_hotkey);

[83.3769]

[83.3899]

            _add_file_to_scroller(fp, cmd_help, help_files[i].hotkey,
                                  help_files[i].auto_hotkey);

Insertion in crawl-ref/source/command.cc at line 1441 [20.4082507]
[19.1189296]
[19.1189296]
```
    {
```

Replacement in crawl-ref/source/command.cc at line 1444 [20.4082507]

B:BD[90.2033] → [90.2033:2087]

B:BD[90.2087] → [86.5326:5379]

                lines[i], true, cmdhelp_textfilter));
    show_keyhelp_menu(formatted_lines, false, true);

[90.2033]

[90.2088]

                lines[i], true, _cmdhelp_textfilter));
    }
    _show_keyhelp_menu(formatted_lines, false, true);

Replacement in crawl-ref/source/command.cc at line 1462 [20.4082507]

B:BD[91.9239] → [91.9239:9299]

    show_keyhelp_menu(cols.formatted_lines(), false, true);

[91.9239]

[86.5380]

    _show_keyhelp_menu(cols.formatted_lines(), false, true);

Replacement in crawl-ref/source/command.cc at line 1480 [20.4082507]
B:BD[90.2237] → [92.3094:3151]
```
static void add_formatted_keyhelp(column_composer &cols)
```
[90.2237]
[19.1189512]
```
static void _add_formatted_keyhelp(column_composer &cols)
```
Replacement in crawl-ref/source/command.cc at line 1494 [20.4082507]
∅:D[93.3580] → [19.1190320:1190365]
B:BD[19.1190320] → [19.1190320:1190365]
```
            true, true, cmdhelp_textfilter);
```
[93.3580]
[19.1190365]
```
            true, true, _cmdhelp_textfilter);
```
Replacement in crawl-ref/source/command.cc at line 1504 [20.4082507]
∅:D[94.1439] → [19.1190754:1190799]
∅:D[85.1521] → [19.1190754:1190799]
∅:D[93.3818] → [19.1190754:1190799]
B:BD[19.1190754] → [19.1190754:1190799]
```
            true, true, cmdhelp_textfilter);
```
[93.3818]
[19.1190799]
```
            true, true, _cmdhelp_textfilter);
```
Replacement in crawl-ref/source/command.cc at line 1516 [20.4082507]
∅:D[94.1617] → [19.1191235:1191280]
∅:D[85.1920] → [19.1191235:1191280]
∅:D[95.2841] → [19.1191235:1191280]
∅:D[93.4081] → [19.1191235:1191280]
B:BD[19.1191235] → [19.1191235:1191280]
```
            true, true, cmdhelp_textfilter);
```
[95.2841]
[19.1191280]
```
            true, true, _cmdhelp_textfilter);
```
Replacement in crawl-ref/source/command.cc at line 1537 [20.4082507]
∅:D[96.1590] → [85.3416:3461]
B:BD[85.3416] → [85.3416:3461]
```
            true, true, cmdhelp_textfilter);
```
[96.1590]
[19.1193313]
```
            true, true, _cmdhelp_textfilter);
```
Replacement in crawl-ref/source/command.cc at line 1548 [20.4082507]
B:BD[93.4942] → [93.4942:4987]
```
            true, true, cmdhelp_textfilter);
```
[93.4942]
[93.4987]
```
            true, true, _cmdhelp_textfilter);
```
Replacement in crawl-ref/source/command.cc at line 1563 [20.4082507]
∅:D[97.452] → [85.3813:3858]
∅:D[98.1847] → [85.3813:3858]
∅:D[93.5564] → [85.3813:3858]
∅:D[99.9927] → [85.3813:3858]
B:BD[85.3813] → [85.3813:3858]
```
            true, true, cmdhelp_textfilter);
```
[93.5564]
[19.1193314]
```
            true, true, _cmdhelp_textfilter);
```
Replacement in crawl-ref/source/command.cc at line 1571 [20.4082507]
B:BD[19.1193550] → [93.5565:5610]
```
            true, true, cmdhelp_textfilter);
```
[19.1193550]
[19.1193599]
```
            true, true, _cmdhelp_textfilter);
```
Replacement in crawl-ref/source/command.cc at line 1586 [20.4082507]
B:BD[93.5902] → [93.5902:5947]
```
            true, true, cmdhelp_textfilter);
```
[93.5902]
[85.3975]
```
            true, true, _cmdhelp_textfilter);
```
Replacement in crawl-ref/source/command.cc at line 1599 [20.4082507]
∅:D[100.8773] → [93.6107:6152]
B:BD[93.6107] → [93.6107:6152]
```
            true, true, cmdhelp_textfilter);
```
[100.8773]
[93.6152]
```
            true, true, _cmdhelp_textfilter);
```
Replacement in crawl-ref/source/command.cc at line 1619 [20.4082507]
B:BD[93.7032] → [93.7032:7077]
```
            true, true, cmdhelp_textfilter);
```
[93.7032]
[19.1194223]
```
            true, true, _cmdhelp_textfilter);
```
Replacement in crawl-ref/source/command.cc at line 1630 [20.4082507]
∅:D[101.599] → [19.1194921:1194966]
∅:D[85.5136] → [19.1194921:1194966]
B:BD[19.1194921] → [19.1194921:1194966]
```
            true, true, cmdhelp_textfilter);
```
[85.4503]
[19.1194966]
```
            true, true, _cmdhelp_textfilter);
```
Replacement in crawl-ref/source/command.cc at line 1639 [20.4082507]
∅:D[85.5294] → [19.1195504:1195549]
∅:D[93.7370] → [19.1195504:1195549]
B:BD[19.1195504] → [19.1195504:1195549]
```
            true, true, cmdhelp_textfilter);
```
[93.7370]
[19.1197188]
```
            true, true, _cmdhelp_textfilter);
```

Replacement in crawl-ref/source/command.cc at line 1642 [20.4082507]

B:BD[19.1197191] → [92.3152:3215]

static void add_formatted_tutorial_help(column_composer &cols)

[19.1197191]

[31.85065]

static void _add_formatted_tutorial_help(column_composer &cols)

Replacement in crawl-ref/source/command.cc at line 1682 [20.4082507]
∅:D[102.351] → [31.86901:86946]
∅:D[103.6966] → [31.86901:86946]
∅:D[104.68139] → [31.86901:86946]
B:BD[31.86901] → [31.86901:86946]
```
            true, true, cmdhelp_textfilter);
```
[102.351]
[31.86946]
```
            true, true, _cmdhelp_textfilter);
```
Replacement in crawl-ref/source/command.cc at line 1705 [20.4082507]
∅:D[105.16200] → [103.6967:7016]
B:BD[94.1924] → [103.6967:7016]
```
            true, true, cmdhelp_textfilter, 40);
```
[105.16200]
[31.88310]
```
            true, true, _cmdhelp_textfilter, 40);
```
Replacement in crawl-ref/source/command.cc at line 1712 [20.4082507]
B:BD[92.3308] → [92.3308:3340]
```
        list_wizard_commands();
```
[92.3308]
[92.3340]
```
        _list_wizard_commands();
```
Replacement in crawl-ref/source/command.cc at line 1727 [20.4082507]
B:BD[92.3646] → [92.3646:3689]
```
        add_formatted_tutorial_help(cols);
```
[92.3646]
[92.3689]
```
        _add_formatted_tutorial_help(cols);
```
Replacement in crawl-ref/source/command.cc at line 1729 [20.4082507]
B:BD[92.3698] → [92.3698:3735]
```
        add_formatted_keyhelp(cols);
```
[92.3698]
[84.28895]
```
        _add_formatted_keyhelp(cols);
```
Replacement in crawl-ref/source/command.cc at line 1731 [20.4082507]
∅:D[84.28896] → [92.3740:3808]
B:BD[92.3740] → [92.3740:3808]
```
    show_keyhelp_menu(cols.formatted_lines(), true, false, hotkey);
```
[84.28896]
[92.3808]
```
    _show_keyhelp_menu(cols.formatted_lines(), true, false, hotkey);
```
Replacement in crawl-ref/source/command.cc at line 1740 [20.4082507]
∅:D[92.3893] → [19.1197191:1197226]
∅:D[31.88314] → [19.1197191:1197226]
B:BD[19.1197191] → [19.1197191:1197226]
```
static void list_wizard_commands()
```
[92.3893]
[19.1198218]
```
static void _list_wizard_commands()
```

Replacement in crawl-ref/source/command.cc at line 1803 [20.4082507]

B:BD[102.3185] → [102.3185:3245]

    show_keyhelp_menu(cols.formatted_lines(), false, true);

[102.3185]

[19.1200533]


    _show_keyhelp_menu(cols.formatted_lines(), false, true);

FR 1962016: Make hydra headedness more obvious.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/travel.cc at line 147 [7.39949]

Insertion in crawl-ref/source/travel.cc at line 416 [7.39949]

Replacement in crawl-ref/source/travel.cc at line 418 [7.39949]

Replacement in crawl-ref/source/travel.cc at line 457 [7.39949]

Replacement in crawl-ref/source/travel.cc at line 462 [7.39949]

Insertion in crawl-ref/source/travel.cc at line 492 [7.39949]

Insertion in crawl-ref/source/travel.cc at line 494 [7.39949]

Replacement in crawl-ref/source/travel.cc at line 1697 [7.39949]

Replacement in crawl-ref/source/traps.cc at line 385 [14.5308]

Replacement in crawl-ref/source/traps.cc at line 405 [14.5308]

Replacement in crawl-ref/source/traps.cc at line 450 [14.5308]

Replacement in crawl-ref/source/traps.cc at line 452 [14.5308]

Replacement in crawl-ref/source/traps.cc at line 471 [14.5308]

Replacement in crawl-ref/source/traps.cc at line 528 [14.5308]

Replacement in crawl-ref/source/player.cc at line 105 [20.962854]

Replacement in crawl-ref/source/player.cc at line 107 [20.962854]

Replacement in crawl-ref/source/player.cc at line 117 [20.962854]

Replacement in crawl-ref/source/player.cc at line 131 [20.962854]

Replacement in crawl-ref/source/player.cc at line 149 [20.962854]

Insertion in crawl-ref/source/player.cc at line 163 [20.962854]

Replacement in crawl-ref/source/player.cc at line 177 [20.962854]

Replacement in crawl-ref/source/player.cc at line 301 [20.962854]

Replacement in crawl-ref/source/player.cc at line 339 [20.962854]

Replacement in crawl-ref/source/player.cc at line 344 [20.962854]

Replacement in crawl-ref/source/player.cc at line 2696 [20.962854]

Replacement in crawl-ref/source/player.cc at line 6222 [20.962854]

Replacement in crawl-ref/source/player.cc at line 6234 [20.962854]

Insertion in crawl-ref/source/notes.h at line 49 [19.368326]

Replacement in crawl-ref/source/notes.cc at line 37 [19.370339]

Replacement in crawl-ref/source/notes.cc at line 39 [19.370339]

Insertion in crawl-ref/source/notes.cc at line 41 [19.370339]

Replacement in crawl-ref/source/notes.cc at line 43 [19.370339]

Insertion in crawl-ref/source/notes.cc at line 46 [19.370339]

Replacement in crawl-ref/source/notes.cc at line 50 [19.370339]

Replacement in crawl-ref/source/notes.cc at line 52 [19.370339]

Insertion in crawl-ref/source/notes.cc at line 55 [19.370339]

Replacement in crawl-ref/source/notes.cc at line 59 [19.370339]

Replacement in crawl-ref/source/notes.cc at line 71 [19.370339]

Replacement in crawl-ref/source/notes.cc at line 73 [19.370339]

Replacement in crawl-ref/source/notes.cc at line 77 [19.370339]

Replacement in crawl-ref/source/notes.cc at line 84 [19.370339]

Replacement in crawl-ref/source/notes.cc at line 91 [19.370339]

Replacement in crawl-ref/source/notes.cc at line 93 [19.370339]

Insertion in crawl-ref/source/notes.cc at line 99 [19.370339]

Replacement in crawl-ref/source/notes.cc at line 104 [19.370339]

Replacement in crawl-ref/source/notes.cc at line 110 [19.370339]

Replacement in crawl-ref/source/notes.cc at line 129 [19.370339]

Replacement in crawl-ref/source/notes.cc at line 132 [19.370339]

Insertion in crawl-ref/source/notes.cc at line 137 [19.370339]

Replacement in crawl-ref/source/notes.cc at line 140 [19.370339]

Insertion in crawl-ref/source/notes.cc at line 144 [19.370339]

Replacement in crawl-ref/source/notes.cc at line 147 [19.370339]

Replacement in crawl-ref/source/notes.cc at line 155 [19.370339]

Replacement in crawl-ref/source/notes.cc at line 157 [19.370339]

Insertion in crawl-ref/source/notes.cc at line 162 [19.370339]

Replacement in crawl-ref/source/notes.cc at line 166 [19.370339]

Replacement in crawl-ref/source/notes.cc at line 168 [19.370339]

Insertion in crawl-ref/source/notes.cc at line 170 [19.370339]

Replacement in crawl-ref/source/notes.cc at line 172 [19.370339]

Insertion in crawl-ref/source/notes.cc at line 176 [19.370339]

Replacement in crawl-ref/source/notes.cc at line 178 [19.370339]

Replacement in crawl-ref/source/notes.cc at line 180 [19.370339]

Replacement in crawl-ref/source/notes.cc at line 183 [19.370339]

Replacement in crawl-ref/source/notes.cc at line 185 [19.370339]

Insertion in crawl-ref/source/notes.cc at line 187 [19.370339]

Replacement in crawl-ref/source/notes.cc at line 189 [19.370339]

Replacement in crawl-ref/source/notes.cc at line 192 [19.370339]

Replacement in crawl-ref/source/notes.cc at line 196 [19.370339]

Replacement in crawl-ref/source/notes.cc at line 203 [19.370339]

Replacement in crawl-ref/source/notes.cc at line 207 [19.370339]

Insertion in crawl-ref/source/notes.cc at line 213 [19.370339]

Replacement in crawl-ref/source/notes.cc at line 225 [19.370339]

Replacement in crawl-ref/source/notes.cc at line 227 [19.370339]

Replacement in crawl-ref/source/notes.cc at line 231 [19.370339]

Replacement in crawl-ref/source/notes.cc at line 241 [19.370339]

Replacement in crawl-ref/source/notes.cc at line 244 [19.370339]