fiddlerwoaroof/crawl - Change MUNICOGJDTT3DH4BIKWYE3LBC2YTSC6XMPB4RGCEABRP6Q7W733QC

Allow tiles in 'V' menu, at least for items - the menu structure can't

handle monster information (yet?) This means that the two parts (monsters/items) are differently formatted but for Tiles this looks much better this way than it did before.

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

Created by j-p-e-g on January 2, 2009

MUNICOGJDTT3DH4BIKWYE3LBC2YTSC6XMPB4RGCEABRP6Q7W733QC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/tilereg.cc at line 2663 [4.54399]
B:BD[3.7381] → [3.7381:7387]
```
    {
```
Replacement in crawl-ref/source/tilereg.cc at line 2664 [4.54399]
B:BD[3.7423] → [3.7423:7429]
```
    }
```
[3.7423]
[3.7429]
Insertion in crawl-ref/source/menu.cc at line 567 [5.261322]
[5.266020]
[6.13146]
```
        {
```
Replacement in crawl-ref/source/menu.cc at line 570 [5.261322]
B:BD[5.266129] → [5.266129:266130]
[5.266129]
[3.26747]
```
        }
```

Replacement in crawl-ref/source/menu.cc at line 1745 [5.261322]

B:BD[7.3578] → [7.3578:3636]

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

[7.3578]

[7.3636]

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

Replacement in crawl-ref/source/menu.cc at line 1749 [5.261322]
B:BD[7.3751] → [7.3751:3772]
```
            if ( p )
```
[7.3751]
[7.3772]
```
            if (p)
```
Replacement in crawl-ref/source/menu.cc at line 1757 [5.261322]
B:BD[7.3931] → [7.3931:3949]
```
        if ( pt )
```
[7.3931]
[7.3949]
```
        if (pt)
```
Insertion in crawl-ref/source/invent.h at line 70 [9.2919073]
[8.768132]
[8.768164]
```
    static bool show_glyph;
```
Insertion in crawl-ref/source/invent.h at line 83 [9.2919073]
[8.768348]
[10.6461]
```
    void set_show_glyph(bool doshow);
```

Insertion in crawl-ref/source/invent.cc at line 192 [9.2920632]

[11.506]


    if (InvEntry::show_glyph)
    {
        unsigned glyph_char;
        unsigned short glyph_col;
        get_item_glyph( item, &glyph_char, &glyph_col );
        const std::string col_string = colour_to_str(glyph_col);
        const std::string prefix = " (<" + col_string + ">"
                                   + static_cast<char>(glyph_char)
                                   + "</" + col_string + ">)";
        tstr << prefix;
    }

Insertion in crawl-ref/source/invent.cc at line 206 [9.2920632]
[11.531]
[8.773035]
Insertion in crawl-ref/source/invent.cc at line 290 [9.2920632]
[8.774812]
[9.2922093]
```
bool InvEntry::show_glyph = false;
```
Insertion in crawl-ref/source/invent.cc at line 293 [9.2920632]
[9.2922094]
[12.10518]
```
void InvEntry::set_show_glyph(bool doshow)
{
    show_glyph = doshow;
}
```
Replacement in crawl-ref/source/invent.cc at line 423 [9.2920632]
B:BD[3.27525] → [3.27525:27547]
```
        return false;
```
[3.27525]
[3.27547]
```
        return (false);
```
Insertion in crawl-ref/source/directn.cc at line 33 [9.3697945]
[13.3723]
[9.3698716]
```
#include "invent.h"
```

Insertion in crawl-ref/source/directn.cc at line 494 [9.3697945]

[13.5169]

/*
    InvMenu desc_menu(MF_SINGLESELECT | MF_ANYPRINTABLE |
                      MF_ALLOW_FORMATTING,
                      "description", false);
*/
    InvMenu desc_menu(MF_SINGLESELECT | MF_ANYPRINTABLE |
                      /*MF_ALWAYS_SHOW_MORE |*/ MF_ALLOW_FORMATTING);

Deletion in crawl-ref/source/directn.cc at line 502 [9.3697945]

B:BD[13.5170] → [13.5170:5294]

    Menu desc_menu(MF_SINGLESELECT | MF_ANYPRINTABLE |
                    /*MF_ALWAYS_SHOW_MORE |*/ MF_ALLOW_FORMATTING);

Replacement in crawl-ref/source/directn.cc at line 581 [9.3697945]
B:BD[13.8084] → [13.8084:8085]
[13.8084]
[13.8085]
```
            const item_def &item = list_items[i];
/*
```
Deletion in crawl-ref/source/directn.cc at line 585 [9.3697945]
B:BD[13.8274] → [2.5236:5286]
```
            const item_def &item = list_items[i];
```

Replacement in crawl-ref/source/directn.cc at line 594 [9.3697945]

∅:D[14.3871] → [13.8954:8955]

∅:D[2.5405] → [13.8954:8955]

B:BD[13.8954] → [13.8954:8955]

B:BD[13.8955] → [14.3872:3989]

B:BD[14.3989] → [2.5406:5453]


            MenuEntry *me = new MenuEntry(str, MEL_ITEM, 1, letter);
            me->data = reinterpret_cast<void*>(
                const_cast<item_def*>(&item));

[2.5405]

[13.9129]

*/
            InvEntry *me = new InvEntry(item);
//            MenuEntry *me = new MenuEntry(str, MEL_ITEM, 1, letter);
//            me->item = item;
//            me->data = reinterpret_cast<void*>(
//                const_cast<item_def*>(&item));
#ifndef USE_TILE
            // Show glyphs only for ASCII.
            me->set_show_glyph(true);
#endif

Insertion in crawl-ref/source/directn.cc at line 605 [9.3697945]
[13.9156]
[13.9156]
```
            me->hotkeys[0] = letter;
```

Allow tiles in 'V' menu, at least for items - the menu structure can't

Dependencies

In channels

Change contents

Deletion in crawl-ref/source/tilereg.cc at line 2663 [4.54399]

Replacement in crawl-ref/source/tilereg.cc at line 2664 [4.54399]

Insertion in crawl-ref/source/menu.cc at line 567 [5.261322]

Replacement in crawl-ref/source/menu.cc at line 570 [5.261322]

Replacement in crawl-ref/source/menu.cc at line 1745 [5.261322]

Replacement in crawl-ref/source/menu.cc at line 1749 [5.261322]

Replacement in crawl-ref/source/menu.cc at line 1757 [5.261322]

Insertion in crawl-ref/source/invent.h at line 70 [9.2919073]

Insertion in crawl-ref/source/invent.h at line 83 [9.2919073]

Insertion in crawl-ref/source/invent.cc at line 192 [9.2920632]

Insertion in crawl-ref/source/invent.cc at line 206 [9.2920632]

Insertion in crawl-ref/source/invent.cc at line 290 [9.2920632]

Insertion in crawl-ref/source/invent.cc at line 293 [9.2920632]

Replacement in crawl-ref/source/invent.cc at line 423 [9.2920632]

Insertion in crawl-ref/source/directn.cc at line 33 [9.3697945]

Insertion in crawl-ref/source/directn.cc at line 494 [9.3697945]

Deletion in crawl-ref/source/directn.cc at line 502 [9.3697945]

Replacement in crawl-ref/source/directn.cc at line 581 [9.3697945]

Deletion in crawl-ref/source/directn.cc at line 585 [9.3697945]

Replacement in crawl-ref/source/directn.cc at line 594 [9.3697945]

Insertion in crawl-ref/source/directn.cc at line 605 [9.3697945]