fiddlerwoaroof/crawl - Change TM35IHKZZNBCMR3ERBS4EYHGUK5IVCPUT2JUITMT74AYAIUZSYFQC

Tiles:

Fix cursed wielded weapons being throwable. (Whoops!)
Improve logic for mouse-over information in inventory.

Add Confusing Touch ("Touch") and Sure Blade ("Blade") to the status output. I've moved BWpn into line 3 to make space for the others. Still, the status can get positively cluttered.

Apply coding convention to static methods in output.cc.

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

Created by j-p-e-g on March 25, 2008

TM35IHKZZNBCMR3ERBS4EYHGUK5IVCPUT2JUITMT74AYAIUZSYFQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/tutorial.cc at line 2043 [8.5936]
[7.15195]
[7.15195]
```
            ostr << "\n";
```

Replacement in crawl-ref/source/travel.cc at line 828 [10.39949]

B:BD[9.259] → [9.259:441]

    if (you.hp != you.hp_max)
        draw_hp_bar(you.hp, you.hp_max);
    if (you.magic_points != you.max_magic_points)
        draw_mp_bar(you.magic_points, you.max_magic_points);

[9.259]

[9.441]

    draw_hp_bar(you.hp, you.hp_max);
    draw_mp_bar(you.magic_points, you.max_magic_points);

Replacement in crawl-ref/source/output.cc at line 51 [11.1088282]
B:BD[11.1088773] → [11.1088773:1088832]
```
static int bad_ench_colour( int lvl, int orange, int red )
```
[11.1088773]
[11.1088832]
```
static int _bad_ench_colour( int lvl, int orange, int red )
```
Replacement in crawl-ref/source/output.cc at line 61 [11.1088282]
B:BD[11.1088954] → [11.1088954:1089009]
```
static void dur_colour( int colour, bool running_out )
```
[11.1088954]
[11.1089009]
```
static void _dur_colour( int colour, bool running_out )
```

Replacement in crawl-ref/source/output.cc at line 113 [11.1088282]

B:BD[12.5747634] → [13.2525:2709]

int draw_colour_bar(int val, int max_val, int old_val, int old_disp,
    int ox, int oy, unsigned short default_colour,
    unsigned short change_colour, unsigned short empty_colour)

[12.5747634]

[12.5747670]

static int _draw_colour_bar(int val, int max_val, int old_val, int old_disp,
                            int ox, int oy, unsigned short default_colour,
                            unsigned short change_colour,
                            unsigned short empty_colour)

Insertion in crawl-ref/source/output.cc at line 118 [11.1088282]
[12.5747672]
[14.2525]
```
    ASSERT(val <= max_val);
```
Deletion in crawl-ref/source/output.cc at line 121 [11.1088282]
B:BD[14.2547] → [14.2547:2553]
```
    {
```
Deletion in crawl-ref/source/output.cc at line 122 [11.1088282]
B:BD[14.2572] → [14.2572:2578]
```
    }
```

Replacement in crawl-ref/source/output.cc at line 123 [11.1088282]

B:BD[9.3019] → [9.3019:3121]

B:BD[9.3121] → [15.2569:2628]

    // Don't redraw colour bars during running/resting
    // *unless* we'll stop doing so after that
    if (you.running > 1 && is_resting() && val != max_val)

[9.3019]

[9.3164]

    // Don't redraw colour bars while resting
    // *unless* we'll stop doing so right after that
    if (you.running >= 2 && is_resting() && val != max_val)

Replacement in crawl-ref/source/output.cc at line 161 [11.1088282]

B:BD[13.3428] → [13.3428:3541]

    old_disp = draw_colour_bar(val, max_val, old_val, old_disp, ox, oy, 
        default_colour, change, empty);

[13.3428]

[13.3541]

    old_disp = _draw_colour_bar(val, max_val, old_val, old_disp, ox, oy,
                                default_colour, change, empty);

Replacement in crawl-ref/source/output.cc at line 177 [11.1088282]

B:BD[13.3839] → [13.3839:3952]

    old_disp = draw_colour_bar(val, max_val, old_val, old_disp, ox, oy, 
        default_colour, change, empty);

[13.3839]

[13.3952]

    old_disp = _draw_colour_bar(val, max_val, old_val, old_disp, ox, oy,
                                default_colour, change, empty);

Replacement in crawl-ref/source/output.cc at line 182 [11.1088282]
B:BD[9.3337] → [9.3337:3370]
```
static int count_digits(int val)
```
[9.3337]
[9.3370]
```
static int _count_digits(int val)
```
Replacement in crawl-ref/source/output.cc at line 194 [11.1088282]
B:BD[16.689] → [17.4426:4463]
```
static std::string describe_hunger()
```
[16.689]
[17.4463]
```
static std::string _describe_hunger()
```

Replacement in crawl-ref/source/output.cc at line 244 [11.1088282]

B:BD[12.5748243] → [18.3101:3196]

    int col = count_digits(you.magic_points) +
        count_digits(you.max_magic_points) + 1;

[12.5748243]

[18.3196]

    int col = _count_digits(you.magic_points)
              + _count_digits(you.max_magic_points) + 1;

Replacement in crawl-ref/source/output.cc at line 285 [11.1088282]

B:BD[12.5748385] → [18.4042:4107]

    int col = count_digits(you.hp)+count_digits(you.hp_max) + 1;

[12.5748385]

[18.4107]

    int col = _count_digits(you.hp) + _count_digits(you.hp_max) + 1;

Replacement in crawl-ref/source/output.cc at line 287 [11.1088282]
B:BD[18.4141] → [18.4141:4186]
```
        col += count_digits(max_max_hp) + 3;
```
[18.4141]
[18.4186]
```
        col += _count_digits(max_max_hp) + 3;
```

Replacement in crawl-ref/source/output.cc at line 377 [11.1088282]

B:BD[18.5944] → [18.5944:6008]

        dur_colour( BLUE, (you.duration[DUR_STONEMAIL] <= 6) );

[18.5944]

[18.6008]

        _dur_colour( BLUE, (you.duration[DUR_STONEMAIL] <= 6) );

Replacement in crawl-ref/source/output.cc at line 515 [11.1088282]
B:BD[11.1093154] → [18.9351:9400]
```
    const std::string state = describe_hunger();
```
[11.1093154]
[18.9400]
```
    const std::string state = _describe_hunger();
```

Replacement in crawl-ref/source/output.cc at line 528 [11.1088282]

B:BD[18.9669] → [5.2554:2657]

// Prints pray, holy, teleport, regen, insulation, fly/lev, invis, silence,
//   breath, bargain, sage

[18.9669]

// Prints:  pray, holy, teleport, regen, insulation, fly/lev, invis, silence,
//   conf. touch, bargain, sage

Replacement in crawl-ref/source/output.cc at line 545 [11.1088282]

B:BD[18.10021] → [18.10021:10093]

        dur_colour( LIGHTGREY, (you.duration[DUR_REPEL_UNDEAD] <= 4) );

[18.10021]

[18.10093]

        _dur_colour( LIGHTGREY, (you.duration[DUR_REPEL_UNDEAD] <= 4) );

Replacement in crawl-ref/source/output.cc at line 558 [11.1088282]

B:BD[11.1093625] → [18.10265:10339]

        dur_colour( MAGENTA, (you.duration[DUR_DEFLECT_MISSILES] <= 6) );

[11.1093625]

[18.10339]

        _dur_colour( MAGENTA, (you.duration[DUR_DEFLECT_MISSILES] <= 6) );

Replacement in crawl-ref/source/output.cc at line 563 [11.1088282]

B:BD[18.10426] → [18.10426:10495]

        dur_colour( BLUE, (you.duration[DUR_REPEL_MISSILES] <= 6) );

[18.10426]

[18.10495]

        _dur_colour( BLUE, (you.duration[DUR_REPEL_MISSILES] <= 6) );

Replacement in crawl-ref/source/output.cc at line 569 [11.1088282]

B:BD[18.10576] → [18.10576:10643]

        dur_colour( BLUE, (you.duration[DUR_REGENERATION] <= 6) );

[18.10576]

[18.10643]

        _dur_colour( BLUE, (you.duration[DUR_REGENERATION] <= 6) );

Replacement in crawl-ref/source/output.cc at line 575 [11.1088282]

B:BD[11.1094078] → [18.10712:10777]

        dur_colour( BLUE, (you.duration[DUR_INSULATION] <= 6) );

[11.1094078]

[18.10777]

        _dur_colour( BLUE, (you.duration[DUR_INSULATION] <= 6) );

Replacement in crawl-ref/source/output.cc at line 585 [11.1088282]

B:BD[18.10961] → [18.10961:11021]

            dur_colour( you.light_flight()? BLUE : MAGENTA,

[18.10961]

[18.11021]

            _dur_colour( you.light_flight()? BLUE : MAGENTA,

Replacement in crawl-ref/source/output.cc at line 591 [11.1088282]

B:BD[11.1094628] → [18.11126:11203]

            dur_colour(BLUE, (you.duration[DUR_LEVITATION] <= 10 && !perm));

[11.1094628]

[18.11203]

            _dur_colour(BLUE, (you.duration[DUR_LEVITATION] <= 10 && !perm));

Replacement in crawl-ref/source/output.cc at line 598 [11.1088282]

B:BD[19.2805] → [18.11269:11329]

        dur_colour( BLUE, (you.duration[DUR_INVIS] <= 6) );

[19.2805]

[18.11329]

        _dur_colour( BLUE, (you.duration[DUR_INVIS] <= 6) );

Replacement in crawl-ref/source/output.cc at line 604 [11.1088282]

B:BD[18.11406] → [18.11406:11468]

        dur_colour( BLUE, (you.duration[DUR_SILENCE] <= 5) );

[18.11406]

[18.11468]

        _dur_colour( BLUE, (you.duration[DUR_SILENCE] <= 5) );

Replacement in crawl-ref/source/output.cc at line 608 [11.1088282]

B:BD[11.1095045] → [18.11502:11796]

    // Perhaps this should be reversed to show when it can be used?
    // In that case, it should be probably be GREEN, and we'd have
    // to check to see if the player does have a breath weapon. -- bwr
    if (you.duration[DUR_BREATH_WEAPON] &&
        wherex() < get_number_of_cols() - 5)

[11.1095045]

[18.11796]

    if (you.duration[DUR_CONFUSING_TOUCH]
        && wherex() < get_number_of_cols() - 5)

Replacement in crawl-ref/source/output.cc at line 611 [11.1088282]

B:BD[18.11802] → [18.11802:11874]

        textcolor( YELLOW );  // no warning
        cprintf( "BWpn " );

[18.11802]

[18.11874]

        _dur_colour( BLUE, (you.duration[DUR_SILENCE] <= 20) );
        cprintf("Touch");

Replacement in crawl-ref/source/output.cc at line 614 [11.1088282]
B:BD[18.11880] → [18.11880:11889]
```
        
```
[18.11880]
[18.11889]
```
    
```

Replacement in crawl-ref/source/output.cc at line 617 [11.1088282]

B:BD[18.11969] → [18.11969:12032]

        dur_colour( BLUE, (you.duration[DUR_BARGAIN] <= 15) );

[18.11969]

[18.12032]

        _dur_colour( BLUE, (you.duration[DUR_BARGAIN] <= 15) );

Replacement in crawl-ref/source/output.cc at line 623 [11.1088282]

B:BD[11.1095475] → [18.12133:12193]

        dur_colour( BLUE, (you.duration[DUR_SAGE] <= 15) );

[11.1095475]

[18.12193]

        _dur_colour( BLUE, (you.duration[DUR_SAGE] <= 15) );

Insertion in crawl-ref/source/output.cc at line 627 [11.1088282]

[11.1095645]

[18.12228]

    if (you.duration[DUR_SURE_BLADE] && wherex() < get_number_of_cols() - 5)
    {
        textcolor( BLUE );
        cprintf( "Blade " );
    }

Replacement in crawl-ref/source/output.cc at line 636 [11.1088282]

B:BD[18.12308] → [5.2658:2749]

// Prints confused, beheld, fire, poison, disease, rot,
//   held, glow, swift, fast, slow

[18.12308]

// Prints confused, beheld, fire, poison, disease, rot, held, glow,
//  swift, fast, slow, breath

Replacement in crawl-ref/source/output.cc at line 673 [11.1088282]

B:BD[18.13449] → [18.13449:13525]

        textcolor( bad_ench_colour( you.duration[DUR_POISONING], 5, 10 ) );

[18.13449]

[18.13525]

        textcolor( _bad_ench_colour( you.duration[DUR_POISONING], 5, 10 ) );

Replacement in crawl-ref/source/output.cc at line 679 [11.1088282]

B:BD[18.13587] → [18.13587:13649]

        textcolor( bad_ench_colour( you.disease, 40, 120 ) );

[18.13587]

[18.13649]

        textcolor( _bad_ench_colour( you.disease, 40, 120 ) );

Replacement in crawl-ref/source/output.cc at line 685 [11.1088282]

B:BD[18.13711] → [18.13711:13770]

        textcolor( bad_ench_colour( you.rotting, 4, 8 ) );

[18.13711]

[18.13770]

        textcolor( _bad_ench_colour( you.rotting, 4, 8 ) );

Replacement in crawl-ref/source/output.cc at line 697 [11.1088282]

B:BD[18.13934] → [18.13934:14085]

        textcolor(
            you.magic_contamination > 5 ?
            bad_ench_colour( you.magic_contamination, 15, 25 )
            : LIGHTBLUE );

[18.13934]

[18.14085]

        textcolor(you.magic_contamination > 5 ?
                     _bad_ench_colour( you.magic_contamination, 15, 25 )
                     : LIGHTBLUE );

Replacement in crawl-ref/source/output.cc at line 705 [11.1088282]

B:BD[11.1096770] → [18.14152:14216]

        dur_colour( BLUE, (you.duration[DUR_SWIFTNESS] <= 6) );

[11.1096770]

[18.14216]

        _dur_colour( BLUE, (you.duration[DUR_SWIFTNESS] <= 6) );

Replacement in crawl-ref/source/output.cc at line 716 [11.1088282]

B:BD[18.14477] → [18.14477:14537]

        dur_colour( BLUE, (you.duration[DUR_HASTE] <= 6) );

[18.14477]

[18.14537]

        _dur_colour( BLUE, (you.duration[DUR_HASTE] <= 6) );

Insertion in crawl-ref/source/output.cc at line 720 [11.1088282]

[11.1097145]

[18.14571]

    // Perhaps this should be reversed to show when it can be used?
    // In that case, it should be probably be GREEN, and we'd have
    // to check to see if the player does have a breath weapon. -- bwr
    if (you.duration[DUR_BREATH_WEAPON] && wherex() < get_number_of_cols() - 5)
    {
        textcolor( YELLOW );  // no warning
        cprintf( "BWpn " );
    }

Insertion in crawl-ref/source/output.cc at line 732 [11.1088282]
[20.2570]
[6.2525]
```
#ifndef USE_TILE
```

Replacement in crawl-ref/source/output.cc at line 749 [11.1088282]

B:BD[20.3026] → [20.3026:3092]

    if (a1 < a2) return true;
    else if (a1 > a2) return false;

[20.3026]

[20.3092]

    if (a1 < a2)
        return true;
    else if (a1 > a2)
        return false;

Replacement in crawl-ref/source/output.cc at line 757 [11.1088282]

∅:D[6.2786] → [20.3268:3338]

B:BD[20.3268] → [20.3268:3338]

    if (xp1 > xp2) return true;
    else if (xp1 < xp2) return false;

[6.2786]

[20.3338]

    if (xp1 > xp2)
        return true;
    else if (xp1 < xp2)
        return false;

Replacement in crawl-ref/source/output.cc at line 763 [11.1088282]

B:BD[20.3400] → [20.3400:3490]

    if (m1->type < m2->type) return true;
    else if (m1->type > m2->type) return false;

[20.3400]

[20.3490]

    if (m1->type < m2->type)
        return true;

Replacement in crawl-ref/source/output.cc at line 809 [11.1088282]

B:BD[6.3618] → [6.3618:3706]

        cprintf(" av%d %d/%d", _average_hp(mon), mon->hit_points, mon->max_hit_points);

[6.3618]

[6.3706]

        cprintf(" av%d %d/%d", _average_hp(mon), mon->hit_points,
                               mon->max_hit_points);

Replacement in crawl-ref/source/output.cc at line 816 [11.1088282]

∅:D[6.3777] → [20.4933:5082]

B:BD[20.4933] → [20.4933:5082]

            switch (att) {
            case ATT_FRIENDLY: cprintf(" (friendly)"); break;
            case ATT_NEUTRAL: cprintf(" (neutral)"); break;

[6.3777]

[20.5082]

            switch (att)
            {
            case ATT_FRIENDLY:  cprintf(" (friendly)");  break;
            case ATT_NEUTRAL:   cprintf(" (neutral)");   break;

Replacement in crawl-ref/source/output.cc at line 849 [11.1088282]

B:BD[20.5780] → [20.5780:5867]

    for (int i_print = 0, i_mons=0;
         i_print < max_print;
         ++ i_print)

[20.5780]

[18.15416]

    for (int i_print = 0, i_mons=0; i_print < max_print; ++i_print)

Insertion in crawl-ref/source/output.cc at line 861 [11.1088282]
[18.15506]
[11.1098646]
```
#endif
```
Insertion in crawl-ref/source/output.cc at line 987 [11.1088282]
[21.1352]
[21.1352]
```
    {
```
Insertion in crawl-ref/source/output.cc at line 989 [11.1088282]
[21.1378]
[21.1378]
```
    }
```
Insertion in crawl-ref/source/output.cc at line 993 [11.1088282]
[10.206175]
[10.206175]
```
        
```

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

B:BD[10.206396] → [22.748:828]

static const char* determine_color_string( int level ) {
    switch ( level ) {

[10.206396]

[22.828]

static const char* _determine_color_string( int level )
{
    switch ( level )
    {

Insertion in crawl-ref/source/output.cc at line 1026 [11.1088282]
[10.206591]
[23.475]
```
// old overview screen, now only used for dumping
```

Replacement in crawl-ref/source/output.cc at line 1168 [11.1088282]

∅:D[24.228] → [22.4457:4758]

B:BD[22.4457] → [22.4457:4758]

             determine_color_string(rfire), itosym3(rfire),
             determine_color_string(rcold), itosym3(rcold),
             determine_color_string(rlife), itosym3(rlife),
             determine_color_string(rpois), itosym1(rpois),
             determine_color_string(relec), itosym1(relec));

[24.228]

[22.4758]

             _determine_color_string(rfire), itosym3(rfire),
             _determine_color_string(rcold), itosym3(rcold),
             _determine_color_string(rlife), itosym3(rlife),
             _determine_color_string(rpois), itosym1(rpois),
             _determine_color_string(relec), itosym1(relec));

Replacement in crawl-ref/source/output.cc at line 1185 [11.1088282]

∅:D[24.369] → [22.5218:5459]

B:BD[22.5218] → [22.5218:5459]

             determine_color_string(rsust), itosym1(rsust),
             determine_color_string(rmuta), itosym1(rmuta),
             determine_color_string(rslow), itosym1(rslow),
             determine_color_string(rclar), itosym1(rclar));

[24.369]

[22.5459]

             _determine_color_string(rsust), itosym1(rsust),
             _determine_color_string(rmuta), itosym1(rmuta),
             _determine_color_string(rslow), itosym1(rslow),
             _determine_color_string(rclar), itosym1(rclar));

Replacement in crawl-ref/source/output.cc at line 1243 [11.1088282]

∅:D[24.511] → [22.6746:6987]

B:BD[22.6746] → [22.6746:6987]

             determine_color_string(rinvi), itosym1(rinvi),
             determine_color_string(rward), itosym1(rward),
             determine_color_string(rcons), itosym1(rcons),
             determine_color_string(rcorr), itosym1(rcorr));

[24.511]

[25.1001]

             _determine_color_string(rinvi), itosym1(rinvi),
             _determine_color_string(rward), itosym1(rward),
             _determine_color_string(rcons), itosym1(rcons),
             _determine_color_string(rcorr), itosym1(rcorr));

Replacement in crawl-ref/source/output.cc at line 1264 [11.1088282]

B:BD[24.664] → [24.664:739]

             determine_color_string(saplevel), pregourmand, postgourmand);

[24.664]

[22.8016]

             _determine_color_string(saplevel), pregourmand, postgourmand);

Insertion in crawl-ref/source/output.cc at line 1270 [11.1088282]
[10.213332]
[24.740]
```
    {
```

Replacement in crawl-ref/source/output.cc at line 1272 [11.1088282]

∅:D[24.795] → [22.8153:8211]

B:BD[22.8153] → [22.8153:8211]

                 determine_color_string(-1), itosym1(1));

[24.795]

[10.213455]

                 _determine_color_string(-1), itosym1(1));
    }

Replacement in crawl-ref/source/output.cc at line 1278 [11.1088282]

∅:D[24.851] → [22.8327:8392]

B:BD[22.8327] → [22.8327:8392]

                 determine_color_string(rrtel), itosym1(rrtel));

[24.851]

[22.8392]

                 _determine_color_string(rrtel), itosym1(rrtel));

Replacement in crawl-ref/source/output.cc at line 1289 [11.1088282]

∅:D[24.958] → [22.8750:8931]

B:BD[22.8750] → [22.8750:8931]

             determine_color_string(rctel), itosym1(rctel),
             determine_color_string(rlevi), itosym1(rlevi),
             determine_color_string(rcfli), itosym1(rcfli));

[24.958]

[22.8931]

             _determine_color_string(rctel), itosym1(rctel),
             _determine_color_string(rlevi), itosym1(rlevi),
             _determine_color_string(rcfli), itosym1(rcfli));

Replacement in crawl-ref/source/output.cc at line 1297 [11.1088282]
B:BD[26.504] → [27.51926:51973]
```
static std::string status_mut_abilities(void);
```
[26.504]
[28.2524]
```
static std::string _status_mut_abilities(void);
```

Replacement in crawl-ref/source/output.cc at line 1300 [11.1088282]

∅:D[3.2560] → [28.2560:2629]

B:BD[28.2560] → [28.2560:2629]

B:BD[28.2629] → [3.2561:2597]

static void _print_overview_screen_equip(
    column_composer& cols,
    std::vector<char>& equip_chars)

[3.2560]

[28.2664]

static void _print_overview_screen_equip(column_composer& cols,
                                         std::vector<char>& equip_chars)

Replacement in crawl-ref/source/output.cc at line 1564 [11.1088282]

B:BD[27.56861] → [27.56861:57342]

             determine_color_string(rfire), itosym3(rfire),
             determine_color_string(rcold), itosym3(rcold),
             determine_color_string(rlife), itosym3(rlife),
             determine_color_string(rpois), itosym1(rpois),
             determine_color_string(relec), itosym1(relec),
             determine_color_string(rsust), itosym1(rsust),
             determine_color_string(rmuta), itosym1(rmuta),
             determine_color_string(rslow), itosym1(rslow));

[27.56861]

[27.57342]

             _determine_color_string(rfire), itosym3(rfire),
             _determine_color_string(rcold), itosym3(rcold),
             _determine_color_string(rlife), itosym3(rlife),
             _determine_color_string(rpois), itosym1(rpois),
             _determine_color_string(relec), itosym1(relec),
             _determine_color_string(rsust), itosym1(rsust),
             _determine_color_string(rmuta), itosym1(rmuta),
             _determine_color_string(rslow), itosym1(rslow));

Replacement in crawl-ref/source/output.cc at line 1589 [11.1088282]

B:BD[27.58319] → [27.58319:58394]

             determine_color_string(saplevel), pregourmand, postgourmand);

[27.58319]

[27.58394]

             _determine_color_string(saplevel), pregourmand, postgourmand);

Replacement in crawl-ref/source/output.cc at line 1607 [11.1088282]

B:BD[27.59113] → [27.59113:59414]

             determine_color_string(rinvi), itosym1(rinvi),
             determine_color_string(rward), itosym1(rward),
             determine_color_string(rcons), itosym1(rcons),
             determine_color_string(rcorr), itosym1(rcorr),
             determine_color_string(rclar), itosym1(rclar));

[27.59113]

[27.59414]

             _determine_color_string(rinvi), itosym1(rinvi),
             _determine_color_string(rward), itosym1(rward),
             _determine_color_string(rcons), itosym1(rcons),
             _determine_color_string(rcorr), itosym1(rcorr),
             _determine_color_string(rclar), itosym1(rclar));

Replacement in crawl-ref/source/output.cc at line 1616 [11.1088282]

B:BD[27.59574] → [27.59574:59632]

                 determine_color_string(-1), itosym1(1));

[27.59574]

[27.59632]

                 _determine_color_string(-1), itosym1(1));

Replacement in crawl-ref/source/output.cc at line 1621 [11.1088282]

B:BD[27.59758] → [27.59758:59823]

                 determine_color_string(rrtel), itosym1(rrtel));

[27.59758]

[27.59823]

                 _determine_color_string(rrtel), itosym1(rrtel));

Replacement in crawl-ref/source/output.cc at line 1632 [11.1088282]

B:BD[27.60181] → [27.60181:60362]

             determine_color_string(rctel), itosym1(rctel),
             determine_color_string(rlevi), itosym1(rlevi),
             determine_color_string(rcfli), itosym1(rcfli));

[27.60181]

[27.60362]

             _determine_color_string(rctel), itosym1(rctel),
             _determine_color_string(rlevi), itosym1(rlevi),
             _determine_color_string(rcfli), itosym1(rcfli));

Replacement in crawl-ref/source/output.cc at line 1653 [11.1088282]
B:BD[3.3889] → [3.3889:3936]
```
    overview.add_text(status_mut_abilities());
```
[3.3889]
[29.3320]
```
    overview.add_text(_status_mut_abilities());
```
Replacement in crawl-ref/source/output.cc at line 1673 [11.1088282]
B:BD[27.62505] → [27.62505:62540]
```
std::string status_mut_abilities()
```
[27.62505]
[27.62540]
```
std::string _status_mut_abilities()
```

Insertion in crawl-ref/source/libgui.cc at line 1186 [12.5793336]

[12.5823220]

}
// assumes the item is equipped in the first place!
static bool _is_true_equipped_item(item_def item)
{
    // weapons and staves are only truly equipped if wielded
    if (item.link == you.equip[EQ_WEAPON])
        return (item.base_type == OBJ_WEAPONS || item.base_type == OBJ_STAVES);
    // cursed armour and rings are only truly equipped if *not* wielded
    return (item.link != you.equip[EQ_WEAPON]);

Insertion in crawl-ref/source/libgui.cc at line 1199 [12.5793336]

[12.5823223]

[4.43287]

// returns whether there's any action you can take with an item in inventory
// apart from dropping it
static bool _can_use_item(item_def item, bool equipped)
{
    // vampires can drain corpses
    if (item.base_type == OBJ_CORPSES)
    {
        return (you.species == SP_VAMPIRE
                && item.sub_type != CORPSE_SKELETON
                && !food_is_rotten(item)
                && mons_has_blood(item.plus));
    }
    // mummies can't do anything with food or potions
    if (you.species == SP_MUMMY)
        return (item.base_type != OBJ_POTIONS && item.base_type != OBJ_FOOD);
    if (equipped && item_cursed(item))
    {
        // misc. items/rods can always be evoked, cursed or not
        if (item.base_type == OBJ_MISCELLANY || item_is_rod(item))
            return true;
            
        // you can't unwield/fire a wielded cursed weapon/staff
        // but cursed armour and rings can be unwielded without problems
        return (!_is_true_equipped_item(item));
    }
        
    // in all other cases you can use the item in some way
    return true;
}

Replacement in crawl-ref/source/libgui.cc at line 1354 [12.5793336]
B:BD[12.5825610] → [12.5825610:5825627]
```
            else
```
[12.5825610]
[12.5825627]
```
            else // in inventory
```

Insertion in crawl-ref/source/libgui.cc at line 1358 [12.5793336]

[12.5825705]

                // FIX ME: Might have to allow wielding as a secondary action
                // for arrows (Sticks to Snakes), skeletons (Boneshards),
                // chunks/potions of blood (Sublimation of Blood)

Insertion in crawl-ref/source/libgui.cc at line 1364 [12.5793336]

[12.5825860]

[30.3654]

                    const bool equipped = itemlist_iflag[cx] & TILEI_FLAG_EQUIP;

Replacement in crawl-ref/source/libgui.cc at line 1367 [12.5793336]

B:BD[30.3708] → [31.3382:3804]

                    if ((type != OBJ_CORPSES
                         || you.species == SP_VAMPIRE
                            && you.inv[ix].sub_type != CORPSE_SKELETON
                            && you.inv[ix].special >= 100)
                         && (you.species != SP_MUMMY
                             || you.inv[ix].base_type != OBJ_POTIONS
                                && you.inv[ix].base_type != OBJ_FOOD))

[30.3708]

[30.3933]

                    if (_can_use_item(you.inv[ix], equipped))

Replacement in crawl-ref/source/libgui.cc at line 1371 [12.5793336]

B:BD[12.5825861] → [30.4002:4069]

                        if (itemlist_iflag[cx] & TILEI_FLAG_EQUIP)

[12.5825861]

[30.4069]

                        if (equipped)

Replacement in crawl-ref/source/libgui.cc at line 1375 [12.5793336]

B:BD[32.5238] → [32.5238:5371]

                                && (!item_is_rod(you.inv[ix])
                                    || !item_type_known(you.inv[ix])))

[32.5238]

[30.4155]

                                && !item_is_rod(you.inv[ix]))

Replacement in crawl-ref/source/libgui.cc at line 1461 [12.5793336]

B:BD[12.5827033] → [33.6847:6907]

                    desc += EOL "[Shift-L-Click] Drop (d)";

[12.5827033]

[12.5827092]

                    // has to be non-equipped or non-cursed to drop
                    if (!equipped || !_is_true_equipped_item(you.inv[ix])
                        || !item_cursed(you.inv[ix]))
                    {
                        desc += EOL "[Shift-L-Click] Drop (d)";
                    }

Insertion in crawl-ref/source/item_use.cc at line 1500 [11.2781507]

[2.3701]

    {
        if (you.equip[EQ_WEAPON] == item
            && item_cursed(you.inv[item]))
        {
            mpr("You can't fire a cursed item!");
            return false;
        }

Insertion in crawl-ref/source/item_use.cc at line 1508 [11.2781507]
[2.3764]
[2.3764]
```
    }
```

Replacement in crawl-ref/source/item_use.cc at line 3522 [11.2781507]

B:BD[34.760830] → [34.760830:760912]

B:BD[34.760912] → [35.6191:6224]

∅:D[35.6224] → [34.760947:760979]

B:BD[34.760947] → [34.760947:760979]

    item_slot = prompt_invent_item(
                    "Inscribe which item? ", 
                    MT_INVLIST, 
                    OSEL_ANY );

[34.760830]

[34.760979]

    item_slot = prompt_invent_item("Inscribe which item? ",
                                   MT_INVLIST, OSEL_ANY );

Replacement in crawl-ref/source/item_use.cc at line 3543 [11.2781507]
B:BD[36.370] → [36.370:403]
```
        you.wield_change = true;
```
[36.370]
[37.3629]
```
        you.wield_change  = true;
```

Deletion in crawl-ref/source/dat/descript/spells.txt at line 309 [38.2853]

B:BD[38.14298] → [38.14298:14460]

%%%%
Glamour
This spell is an Elvish magic, which draws upon the viewing creature's credulity and the caster's comeliness to charm, confuse or render comatose.

Replacement in crawl-ref/docs/crawl_options.txt at line 14 [40.63392]

B:BD[39.15700] → [39.15700:15753]

		weapon, book, chaos_knight, death_knight, priest,

[39.15700]

[41.3252]

	        weapon, book, chaos_knight, death_knight, priest,

Replacement in crawl-ref/docs/crawl_options.txt at line 82 [40.63392]

B:BD[42.6824] → [42.6824:6890]

		tile_item_col, tile_unseen_col, tile_floor_col, tile_wall_col,

[42.6824]

[43.3904]

                tile_item_col, tile_unseen_col, tile_floor_col, tile_wall_col,

Replacement in crawl-ref/docs/crawl_options.txt at line 1274 [40.63392]
B:BD[12.5939879] → [12.5939879:5939911]
```
        represents empty slots.
```
[12.5939879]
[44.35513]
```
        represents empty slots, the dot items on the floor.
```