fiddlerwoaroof/crawl - Change 6BS4ULA6VSXUECPKHRUXY2AF2TX3JHUUKFROF2AC6N4BBO7NCZAAC

Apply r9904 to trunk.

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

Created by j-p-e-g on June 6, 2009

6BS4ULA6VSXUECPKHRUXY2AF2TX3JHUUKFROF2AC6N4BBO7NCZAAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/tilereg.cc at line 2628 [7.54399]
∅:D[3.380] → [6.505:541]
B:BD[8.4484] → [6.505:541]
∅:D[6.541] → [8.4566:4598]
B:BD[8.4566] → [8.4566:4598]
```
    const int max_tile_height = 32;
    const int entry_buffer = 1;
```
[3.380]
[8.4598]
```
    const int max_tile_height = (Options.tile_menu_icons ? 32 : 0);
    const int entry_buffer    = 1;
```

Replacement in crawl-ref/source/tilereg.cc at line 2671 [7.54399]

∅:D[9.729] → [6.697:769]

B:BD[8.5103] → [6.697:769]

        int text_width = m_font_entry->string_width(m_entries[i].text);

[9.729]

[6.769]

        int text_width  = m_font_entry->string_width(m_entries[i].text);

Replacement in crawl-ref/source/tilereg.cc at line 2717 [7.54399]

B:BD[6.2379] → [6.2379:2446]

            if (text_sx + text_width > entry_start + column_width)

[6.2379]

[6.2446]

            if (Options.tile_menu_icons
                && text_sx + text_width > entry_start + column_width)

Replacement in crawl-ref/source/tilereg.cc at line 2845 [7.54399]

B:BD[9.1460] → [9.1460:1567]

    int lines = count_linebreaks(m_more);
    int more_height = (lines + 1) * m_font_entry->char_height();

[9.1460]

[9.1567]

    const int lines = count_linebreaks(m_more);
    const int more_height = (lines + 1) * m_font_entry->char_height();
    // Similar to the definition of max_entry_height in place_entries().
    const int div = (Options.tile_menu_icons ? 32
                                             : m_font_entry->char_height());

Replacement in crawl-ref/source/tilereg.cc at line 2852 [7.54399]

B:BD[9.1568] → [9.1568:1630]

    int pagesize = ((my - more_height) / 32) * m_max_columns;

[9.1568]

[5.325]

    const int pagesize = ((my - more_height) / div) * m_max_columns;

Replacement in crawl-ref/source/menu.cc at line 1350 [11.261322]
B:BD[10.2188] → [10.2188:2222]
```
        if ( !is_set(MF_NOWRAP) )
```
[10.2188]
[12.3249]
```
        if (!is_set(MF_NOWRAP))
```
Replacement in crawl-ref/source/menu.cc at line 1363 [11.261322]
B:BD[10.2406] → [10.2406:2440]
```
        if ( !is_set(MF_NOWRAP) )
```
[10.2406]
[12.3346]
```
        if (!is_set(MF_NOWRAP))
```
Replacement in crawl-ref/source/menu.cc at line 1623 [11.261322]
B:BD[13.17980] → [13.17980:18009]
```
    while ( loc < s.size() )
```
[13.17980]
[13.18009]
```
    while (loc < s.size())
```
Replacement in crawl-ref/source/menu.cc at line 1625 [11.261322]
B:BD[13.18015] → [13.18015:18054]
```
        if ( s[loc] == '<' )    // tag
```
[13.18015]
[13.18054]
```
        if (s[loc] == '<')    // tag
```

Replacement in crawl-ref/source/menu.cc at line 1628 [11.261322]

B:BD[13.18089] → [13.18089:18146]

            if ( loc + 1 < s.size() && s[loc+1] == '<' )

[13.18089]

[13.18146]

            if (loc + 1 < s.size() && s[loc+1] == '<')

Replacement in crawl-ref/source/menu.cc at line 1636 [11.261322]

B:BD[13.18344] → [13.18344:18398]

            while ( loc < s.size() && s[loc] != '>' )

[13.18344]

[13.18398]

            while (loc < s.size() && s[loc] != '>')

Replacement in crawl-ref/source/menu.cc at line 1643 [11.261322]
B:BD[13.18508] → [13.18508:18542]
```
            if ( s[loc] == '\n' )
```
[13.18508]
[13.18542]
```
            if (s[loc] == '\n')
```

Replacement in crawl-ref/source/menu.cc at line 1646 [11.261322]

B:BD[13.18598] → [13.18598:18654]

            else if ( s[loc] == ' ' && xpos > wrapcol )

[13.18598]

[13.18654]

            else if (s[loc] == ' ' && xpos > wrapcol)

Replacement in crawl-ref/source/menu.cc at line 1653 [11.261322]
B:BD[13.18808] → [13.18808:18846]
```
            else if ( xpos > maxcol )
```
[13.18808]
[13.18846]
```
            else if (xpos > maxcol)
```
Replacement in crawl-ref/source/menu.cc at line 1694 [11.261322]
∅:D[2.2626] → [14.51996:52030]
B:BD[14.51996] → [14.51996:52030]
```
            if ( s[loc] == '\n' )
```
[2.2626]
[2.2627]
```
            if (s[loc] == '\n')
```
Replacement in crawl-ref/source/menu.cc at line 1703 [11.261322]
B:BD[2.2765] → [2.2765:2799]
```
            if ( xpos >= maxcol )
```
[2.2765]
[14.52099]
```
            if (xpos >= maxcol)
```
Replacement in crawl-ref/source/menu.cc at line 1720 [11.261322]
B:BD[2.3051] → [2.3051:3095]
```
            if ( s[loc] == ' ' && xpos > 0)
```
[2.3051]
[14.52439]
```
            if (s[loc] == ' ' && xpos > 0)
```
Replacement in crawl-ref/source/it_use3.cc at line 817 [15.2870456]
B:BD[4.4266] → [4.4266:4312]
```
    if (!item_is_evokable(item, false, true))
```
[4.4266]
[4.4312]
```
    if (!item_is_evokable(item, false, false, true))
```

Replacement in crawl-ref/source/invent.h at line 238 [15.2919073]

B:BD[16.5943] → [16.5943:5984]

                      bool msg = false);

[16.5943]

[16.5984]

                      bool all_wands = false, bool msg = false);

Replacement in crawl-ref/source/invent.cc at line 329 [15.2920632]

B:BD[6.10645] → [6.10645:10679]

    mdisplay->set_num_columns(2);

[6.10645]

[6.10679]

    if (Options.tile_menu_icons)
        mdisplay->set_num_columns(2);

Insertion in crawl-ref/source/invent.cc at line 647 [15.2920632]

[17.2802]

[18.5212]

}
bool sort_item_charged(const InvEntry *a)
{
    return (a->item->base_type != OBJ_WANDS
            || !item_is_evokable(*(a->item), true));

Replacement in crawl-ref/source/invent.cc at line 656 [15.2920632]

∅:D[19.2791] → [20.8492:8561]

B:BD[20.8492] → [20.8492:8561]

                                  const item_sort_comparators *cmps)

[19.2791]

[20.8561]

                                   const item_sort_comparators *cmps)

Insertion in crawl-ref/source/invent.cc at line 703 [15.2920632]
[17.2872]
[18.5732]
```
          { "charged",   compare_item<bool, sort_item_charged>},
```
Replacement in crawl-ref/source/invent.cc at line 1034 [15.2920632]
B:BD[16.6105] → [16.6105:6149]
```
        return (item_is_evokable(i, true));
```
[16.6105]
[16.6149]
```
        return (item_is_evokable(i, true, true));
```

Replacement in crawl-ref/source/invent.cc at line 1720 [15.2920632]

B:BD[16.6152] → [16.6152:6218]

bool item_is_evokable(const item_def &item, bool known, bool msg)

[16.6152]

[16.6218]

bool item_is_evokable(const item_def &item, bool known, bool all_wands,
                      bool msg)

Insertion in crawl-ref/source/invent.cc at line 1728 [15.2920632]
[16.6337]
[16.6337]
```
        if (all_wands)
            return (true);
```

Insertion in crawl-ref/docs/options_guide.txt at line 1155 [22.63392]

[18.14132]

[21.27448]

        * charged:
          Makes wands known or assumed to have some charges left appear
          before wands known to be empty; irrelevant for all other item
          types.

Apply r9904 to trunk.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/tilereg.cc at line 2628 [7.54399]

Replacement in crawl-ref/source/tilereg.cc at line 2671 [7.54399]

Replacement in crawl-ref/source/tilereg.cc at line 2717 [7.54399]

Replacement in crawl-ref/source/tilereg.cc at line 2845 [7.54399]

Replacement in crawl-ref/source/tilereg.cc at line 2852 [7.54399]

Replacement in crawl-ref/source/menu.cc at line 1350 [11.261322]

Replacement in crawl-ref/source/menu.cc at line 1363 [11.261322]

Replacement in crawl-ref/source/menu.cc at line 1623 [11.261322]

Replacement in crawl-ref/source/menu.cc at line 1625 [11.261322]

Replacement in crawl-ref/source/menu.cc at line 1628 [11.261322]

Replacement in crawl-ref/source/menu.cc at line 1636 [11.261322]

Replacement in crawl-ref/source/menu.cc at line 1643 [11.261322]

Replacement in crawl-ref/source/menu.cc at line 1646 [11.261322]

Replacement in crawl-ref/source/menu.cc at line 1653 [11.261322]

Replacement in crawl-ref/source/menu.cc at line 1694 [11.261322]

Replacement in crawl-ref/source/menu.cc at line 1703 [11.261322]

Replacement in crawl-ref/source/menu.cc at line 1720 [11.261322]

Replacement in crawl-ref/source/it_use3.cc at line 817 [15.2870456]

Replacement in crawl-ref/source/invent.h at line 238 [15.2919073]

Replacement in crawl-ref/source/invent.cc at line 329 [15.2920632]

Insertion in crawl-ref/source/invent.cc at line 647 [15.2920632]

Replacement in crawl-ref/source/invent.cc at line 656 [15.2920632]

Insertion in crawl-ref/source/invent.cc at line 703 [15.2920632]

Replacement in crawl-ref/source/invent.cc at line 1034 [15.2920632]

Replacement in crawl-ref/source/invent.cc at line 1720 [15.2920632]

Insertion in crawl-ref/source/invent.cc at line 1728 [15.2920632]

Insertion in crawl-ref/docs/options_guide.txt at line 1155 [22.63392]