fiddlerwoaroof/crawl - Change 22REG5ZRWVFFAA37IUCQWNR3BZVTPUCAN2EFFTAVR4O4DPLQOHNQC

drop_filter can now match against the same keywords as menu_colour, minus the

identification status and chunk/corpse information.

drop_filter now defaults to useless_item

You can prevent an init file variable from being changed by turning it into a constant.

Clear variables and aliases when resetting the game options.

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

Created by zelgadis on December 30, 2008

22REG5ZRWVFFAA37IUCQWNR3BZVTPUCAN2EFFTAVR4O4DPLQOHNQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/menu.h at line 141 [5.255942]

[4.23859]

    virtual std::string get_filter_text() const
    {
        return get_text();
    }

Replacement in crawl-ref/source/menu.cc at line 678 [5.261322]
∅:D[6.13216] → [5.268870:268918]
B:BD[5.268870] → [5.268870:268918]
```
    std::string text = items[item]->get_text();
```
[6.13216]
[5.268918]
```
    std::string text = items[item]->get_filter_text();
```

Insertion in crawl-ref/source/itemname.h at line 131 [9.2661173]

[7.3037]

[8.4835]

const std::string filtering_item_prefix(const item_def &item,
                                        bool temp = true);

Replacement in crawl-ref/source/itemname.cc at line 2511 [9.2667494]

B:BD[10.14387] → [7.4243:4318]

const std::string menu_colour_item_prefix(const item_def &item, bool temp)

[10.14387]

[10.14451]

static const std::string _item_prefix(const item_def &item, bool temp,
                                      bool filter)

Replacement in crawl-ref/source/itemname.cc at line 2516 [9.2667494]

B:BD[10.14493] → [10.14493:14537]

    if (item_ident(item, ISFLAG_KNOW_TYPE))

[10.14493]

[10.14537]

    // No identified/unidentified for filtering, since the user might
    // want to filter on "ident" to find scrolls of identify.
    if (filter)
        ;
    else if (item_ident(item, ISFLAG_KNOW_TYPE))

Replacement in crawl-ref/source/itemname.cc at line 2592 [9.2667494]

B:BD[11.4184] → [12.7652:7684]

        if (is_poisonous(item))

[11.4184]

[11.4298]

        // Don't include these for filtering, since the user might want
        // to use "muta" to search for "potion of cure mutation", and
        // similar.
        if (filter)
            ;
        else if (is_poisonous(item))

Replacement in crawl-ref/source/itemname.cc at line 2635 [9.2667494]
B:BD[13.4619] → [11.4863:4905]
```
    if (Options.menu_colour_prefix_class)
```
[13.4619]
[11.4905]
```
    if (Options.menu_colour_prefix_class && !filter)
```

Insertion in crawl-ref/source/itemname.cc at line 2642 [9.2667494]

[11.5130]

[14.6652]

}
const std::string menu_colour_item_prefix(const item_def &item, bool temp)
{
    return _item_prefix(item, temp, false);

Insertion in crawl-ref/source/itemname.cc at line 2649 [9.2667494]

[14.6655]

[8.4998]

const std::string filtering_item_prefix(const item_def &item, bool temp)
{
    return _item_prefix(item, temp, true);
}

Insertion in crawl-ref/source/invent.h at line 101 [9.2919073]
[3.2803]
[13.4841]
```
    virtual std::string get_filter_text() const;
```

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

[3.2939]

[15.772927]

std::string InvEntry::get_filter_text() const
{
    return (filtering_item_prefix(*item) + " " + get_text());
}

Insertion in crawl-ref/source/initfile.cc at line 936 [9.2957258]

[16.3614]

[17.545]


    // Forget variables and such.
    aliases.clear();
    variables.clear();
    constants.clear();

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

B:BD[2.2668] → [2.2668:2708]

        variables[key.substr(1)] = val;

[2.2668]

[2.2708]

    {
        std::string name = key.substr(1);
        // Don't alter if it's a constant.
        if (constants.find(name) != constants.end())
            return;
        variables[name] = val;
    }

Insertion in crawl-ref/source/initfile.cc at line 3056 [9.2957258]

[18.11364]

    }
    else if (key == "constant")
    {
        if (variables.find(field) == variables.end())
            report_error(make_stringf("No variable named '%s' to make "
                                      "constant", field.c_str()));
        else if (constants.find(field) != constants.end())
            report_error(make_stringf("'%s' is already a constant",
                                      field.c_str()));
        else
            constants.insert(field);

Insertion in crawl-ref/source/externs.h at line 2224 [9.3270163]
[2.4359]
[16.15069]
```
    std::set<std::string>    constants; // Variables that can't be changed
```
Insertion in crawl-ref/settings/init.txt at line 98 [9.4830895]
[19.2859]
[20.11107]
```
drop_filter = useless_item
```

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

[21.5856]


To prevent a variable from being changed you can make it a constant:
    constant = useless
This is usefull if you wish to prevent an included file from altering
a variable.

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

[23.4922]

[24.14119]

        drop_filter will match against the same keywords menu_colour uses,
        except that it lacks identification status and corpse/chunk
        information.  It defaults to useless_item.