fiddlerwoaroof/crawl - Change B7EE54F23AM4BECQ7GENNC4MHIPH6YVMOXOGZAQUZJKDJYGL7RAQC

Allow specific colouring of pickup menu (as opposed to general

inventory). To do so, use "pickup:colour:pattern".

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

Created by j-p-e-g on April 17, 2008

B7EE54F23AM4BECQ7GENNC4MHIPH6YVMOXOGZAQUZJKDJYGL7RAQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/menu.h at line 40 [3.255942]
B:BD[3.256355] → [3.256355:256360]
```
    
```
[3.256355]
[3.256360]

Replacement in crawl-ref/source/menu.h at line 82 [3.255942]

B:BD[3.257147] → [3.257147:257294]

        colour = lev == MEL_ITEM?       LIGHTGREY :
                 lev == MEL_SUBTITLE?   BLUE  :
                                        WHITE;

[3.257147]

[3.257294]

        colour = (lev == MEL_ITEM     ?  LIGHTGREY :
                  lev == MEL_SUBTITLE ?  BLUE  :
                                         WHITE);

Replacement in crawl-ref/source/menu.h at line 90 [3.255942]

B:BD[3.257387] → [4.560036:560087]

    bool operator<( const MenuEntry& rhs ) const {

[3.257387]

[5.2493]

    bool operator<( const MenuEntry& rhs ) const
    {

Replacement in crawl-ref/source/menu.h at line 100 [3.255942]
B:BD[3.257504] → [3.257504:257509]
```
    
```
[3.257504]
[3.257509]
Replacement in crawl-ref/source/menu.h at line 110 [3.255942]
B:BD[3.257749] → [3.257749:257754]
```
    
```
[3.257749]
[3.257754]

Replacement in crawl-ref/source/menu.h at line 169 [3.255942]

B:BD[4.560395] → [4.560395:560473]

    MF_ANYPRINTABLE     = 0x0008,   // Any printable character is valid, and

[4.560395]

[4.560473]

    MF_ANYPRINTABLE     = 0x0008,   // Any printable character is valid, and

Replacement in crawl-ref/source/menu.h at line 201 [3.255942]
B:BD[6.3146] → [6.3146:3154]
```
    // 
```
[6.3146]
[6.3154]
```
    //
```
Replacement in crawl-ref/source/menu.h at line 210 [3.255942]
B:BD[6.3562] → [6.3562:3567]
```
    
```
[6.3562]
[3.259418]
Replacement in crawl-ref/source/menu.h at line 222 [3.255942]
∅:D[7.678] → [3.259586:259591]
∅:D[4.561135] → [3.259586:259591]
B:BD[3.259586] → [3.259586:259591]
```
    
```
[7.678]
[3.259591]
Replacement in crawl-ref/source/menu.h at line 229 [3.255942]
∅:D[4.561237] → [3.259692:259697]
B:BD[3.259692] → [3.259692:259697]
```
    
```
[4.561237]
[3.259697]
Replacement in crawl-ref/source/menu.h at line 266 [3.255942]
∅:D[7.700] → [3.260271:260276]
B:BD[3.260271] → [3.260271:260276]
```
    
```
[7.700]
[3.260276]
Replacement in crawl-ref/source/menu.h at line 317 [3.255942]
∅:D[4.562466] → [3.261183:261188]
B:BD[3.261183] → [3.261183:261188]
```
    
```
[4.562466]
[3.261188]
Replacement in crawl-ref/source/menu.h at line 394 [3.255942]
B:BD[4.563768] → [4.563768:563802]
```
    void add_formatted(int ncol, 
```
[4.563768]
[4.563802]
```
    void add_formatted(int ncol,
```
Replacement in crawl-ref/source/menu.h at line 429 [3.255942]
B:BD[8.3759] → [8.3759:3763]
```
// 
```
[8.3759]
[8.3763]
```
//
```

Replacement in crawl-ref/source/menu.cc at line 1172 [3.261322]

B:BD[7.1100] → [7.1100:1213]

        if ( (cm.tag.empty() || cm.tag == "any" || cm.tag == tag) &&
             cm.pattern.matches(tmp_text) )

[7.1100]

[7.1213]

        if ( (cm.tag.empty() || cm.tag == "any" || cm.tag == tag
              || cm.tag == "inventory" && tag == "pickup")
            && cm.pattern.matches(tmp_text) )

Deletion in crawl-ref/source/items.cc at line 667 [9.2584728]
∅:D[2.6708] → [4.633014:633015]
B:BD[4.633014] → [4.633014:633015]
Replacement in crawl-ref/source/invent.h at line 46 [9.2919073]
B:BD[3.368700] → [3.368700:368742]
```
        : slot(s), quantity(q), item(it) 
```
[3.368700]
[3.368742]
```
        : slot(s), quantity(q), item(it)
```
Replacement in crawl-ref/source/invent.h at line 58 [9.2919073]
B:BD[4.767906] → [4.767906:767911]
```
    
```
[4.767906]
[4.767911]
Replacement in crawl-ref/source/invent.h at line 74 [9.2919073]
B:BD[10.6455] → [10.6455:6460]
```
    
```
[10.6455]
[4.768211]
Replacement in crawl-ref/source/invent.h at line 115 [9.2919073]
B:BD[4.768542] → [4.768542:768584]
```
    InvMenu(int mflags = MF_MULTISELECT) 
```
[4.768542]
[7.1466]
```
    InvMenu(int mflags = MF_MULTISELECT)
```

Replacement in crawl-ref/source/invent.h at line 172 [9.2919073]

∅:D[4.770447] → [9.2919488:2919591]

B:BD[9.2919488] → [9.2919488:2919591]

                        bool must_exist = true, 
                        bool allow_auto_list = true,

[4.770447]

[9.2919591]

                        bool must_exist = true,
                        bool allow_auto_list = true,

Replacement in crawl-ref/source/invent.h at line 180 [9.2919073]

B:BD[4.770592] → [4.770592:770660]

                        const std::vector<const item_def*> &items,

[4.770592]

[10.6874]

                        const std::vector<const item_def*> &items,

Deletion in crawl-ref/source/invent.cc at line 561 [9.2920632]
B:BD[4.777196] → [10.11082:11083]
Replacement in crawl-ref/source/invent.cc at line 565 [9.2920632]
B:BD[3.373907] → [4.777247:777284]
```
        if (!inv_class[i]) continue;
```
[3.373907]
[4.777284]
```
        if (!inv_class[i])
            continue;
```

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

B:BD[4.777463] → [4.777463:777516]

            if (mitems[j]->base_type != i) continue;

[4.777463]

[4.777516]

            if (mitems[j]->base_type != i)
                continue;

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

[4.777863]

            if (this->tag == "pickup")
                ie->tag = "pickup";

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

[4.779849]

        if (mtype == MT_PICKUP)
            menu.set_tag("pickup");

Replacement in crawl-ref/source/initfile.cc at line 2448 [9.2957258]
B:BD[7.2151] → [7.2151:2186]
```
            mapping.tag = tagname;
```
[7.2151]
[7.2186]
```
            mapping.tag     = tagname;
```

Replacement in crawl-ref/source/initfile.cc at line 2450 [9.2957258]

B:BD[7.2225] → [7.2225:2278]

            mapping.colour = str_to_colour(colname);

[7.2225]

[7.2278]

            mapping.colour  = str_to_colour(colname);

Replacement in crawl-ref/docs/options_guide.txt at line 900 [12.63392]

B:BD[10.16051] → [11.26078:26192]

        When sort_menus = true, items are sorted by base name, qualified
        name, curse status and quantity.

[10.16051]

[10.16165]

        When sort_menus = true, items are sorted according to the specified
	sort_order, with the default being:
	     equipped, basename, qualname, curse, qty

Replacement in crawl-ref/docs/options_guide.txt at line 913 [12.63392]

B:BD[10.16564] → [11.26384:26448]

             sort_menus = true : basename, qualname, curse, qty

[10.16564]

[13.12690]

             sort_menus = true : art, basename, qualname, curse, qty

Replacement in crawl-ref/docs/options_guide.txt at line 917 [12.63392]

B:BD[13.12828] → [13.12828:13088]

        if the basenames of two different items are different they
        will be alphabetically compared using their basenames; if
        the basenames are the same but the qualified names different
        it will compare their qualified names, and so on.

[13.12828]

[10.16627]

        if only one of two different items is a known artefact, it will be 
	listed first, else (if both or neither are artefacts) if their
        basenames are different they will be alphabetically compared 
	using their basenames; if the basenames are the same but the 
	qualified names different it will compare their qualified 
	names, and so on.

Deletion in crawl-ref/docs/options_guide.txt at line 976 [12.63392]
B:BD[13.14132] → [11.27353:27447]
∅:D[13.14223] → [10.17677:17678]
∅:D[11.27447] → [10.17677:17678]
B:BD[10.17677] → [10.17677:17678]
```
        The default sort criteria are: 
          "equipped, basename, qualname, curse, qty".
```

Insertion in crawl-ref/docs/options_guide.txt at line 987 [12.63392]

[10.18074]

        By default only pickup menus are sorted, and the sort criteria are: 
          "basename, qualname, curse, qty".
	All other menus (drop, inv) will be sorted by inventory letter.

Replacement in crawl-ref/docs/options_guide.txt at line 1121 [12.63392]

B:BD[14.2416] → [14.2416:2486]

        If you like to see rotten chunks and corpses at a glance, use

[14.2416]

[15.2259]

        If you'd like to see rotten chunks and corpses at a glance, use

Allow specific colouring of pickup menu (as opposed to general

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/menu.h at line 40 [3.255942]

Replacement in crawl-ref/source/menu.h at line 82 [3.255942]

Replacement in crawl-ref/source/menu.h at line 90 [3.255942]

Replacement in crawl-ref/source/menu.h at line 100 [3.255942]

Replacement in crawl-ref/source/menu.h at line 110 [3.255942]

Replacement in crawl-ref/source/menu.h at line 169 [3.255942]

Replacement in crawl-ref/source/menu.h at line 201 [3.255942]

Replacement in crawl-ref/source/menu.h at line 210 [3.255942]

Replacement in crawl-ref/source/menu.h at line 222 [3.255942]

Replacement in crawl-ref/source/menu.h at line 229 [3.255942]

Replacement in crawl-ref/source/menu.h at line 266 [3.255942]

Replacement in crawl-ref/source/menu.h at line 317 [3.255942]

Replacement in crawl-ref/source/menu.h at line 394 [3.255942]

Replacement in crawl-ref/source/menu.h at line 429 [3.255942]

Replacement in crawl-ref/source/menu.cc at line 1172 [3.261322]

Deletion in crawl-ref/source/items.cc at line 667 [9.2584728]

Replacement in crawl-ref/source/invent.h at line 46 [9.2919073]

Replacement in crawl-ref/source/invent.h at line 58 [9.2919073]

Replacement in crawl-ref/source/invent.h at line 74 [9.2919073]

Replacement in crawl-ref/source/invent.h at line 115 [9.2919073]