fiddlerwoaroof/crawl - Change OQ76R2BGEXU64TGDEQF46WVKM3LW5JO67CVITYQSIKE36LQZ725AC

* Fix 2687930: Shorten the spell menu more, and don't call update_title()

at '?' as apparently all it does is hide the first spell line.

Uncomment the autoinscription of weapons of distortion in init.txt.

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

Created by j-p-e-g on March 16, 2009

OQ76R2BGEXU64TGDEQF46WVKM3LW5JO67CVITYQSIKE36LQZ725AC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/tilesdl.cc at line 186 [4.19415]

B:BD[3.800] → [3.800:850]

    } while (++auto_size < num_screen_sizes - 1);

[3.800]

[3.850]

    }
    while (++auto_size < num_screen_sizes - 1);

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

B:BD[4.56544] → [4.56544:56873]

const int cmd_shift[9] = {'B', 'J', 'N', 'H', '5', 'L', 'Y', 'K', 'U'};
const int cmd_ctrl[9] = {CONTROL('B'), CONTROL('J'), CONTROL('N'),
                      CONTROL('H'), 'X', CONTROL('L'),
                      CONTROL('Y'), CONTROL('K'), CONTROL('U')};
const int cmd_dir[9] = {'1', '2', '3', '4', '5', '6', '7', '8', '9'};

[4.56544]

[4.56873]

const int cmd_shift[9]  = {'B', 'J', 'N', 'H', '5', 'L', 'Y', 'K', 'U'};
const int cmd_ctrl[9]   = {CONTROL('B'), CONTROL('J'), CONTROL('N'),
                           CONTROL('H'), 'X', CONTROL('L'),
                           CONTROL('Y'), CONTROL('K'), CONTROL('U')};
const int cmd_dir[9]    = {'1', '2', '3', '4', '5', '6', '7', '8', '9'};

Replacement in crawl-ref/source/tilereg.cc at line 1257 [4.54399]
B:BD[4.88690] → [5.3389:3427]
∅:D[5.3427] → [4.88737:88743]
B:BD[4.88737] → [4.88737:88743]
```
    for (int i = 0; i < mx * my; i++)
    {
```
[4.88690]
[4.88743]
```
    for (int i = 0; i < mx * my; ++i)
```
Deletion in crawl-ref/source/tilereg.cc at line 1259 [4.54399]
B:BD[4.88794] → [4.88794:88800]
```
    }
```
Deletion in crawl-ref/source/stash.cc at line 1781 [8.147324]
B:BD[6.2211] → [7.398:456]
```
//          allow_toggle(true), menu_action(ACT_EXECUTE),
```
Replacement in crawl-ref/source/stash.cc at line 1838 [8.147324]
∅:D[9.240] → [8.183081:183120]
B:BD[8.183081] → [8.183081:183120]
```
    stashmenu.can_travel = travelable;
```
[9.240]
[7.655]
```
    stashmenu.can_travel   = travelable;
```
Replacement in crawl-ref/source/stash.cc at line 1840 [8.147324]
B:BD[7.690] → [7.690:737]
```
    stashmenu.menu_action = Menu::ACT_EXECUTE;
```
[7.690]
[10.889]
```
    stashmenu.menu_action  = Menu::ACT_EXECUTE;
```
Replacement in crawl-ref/source/spl-cast.cc at line 219 [13.293070]
B:BD[11.905] → [12.815:856]
```
    more_str += "to toggle spell view.";
```
[11.905]
[12.856]
```
    more_str += "to toggle spell view";
```

Replacement in crawl-ref/source/spl-cast.cc at line 224 [13.293070]

B:BD[12.968] → [2.269:336]

∅:D[2.336] → [12.1036:1077]

B:BD[12.1036] → [12.1036:1077]

        more_str += " Press '?' to toggle between spell selection"
                    " and description.";

[12.968]

[11.1015]

        more_str += ", or '?' to read the descriptions";

Insertion in crawl-ref/source/spl-cast.cc at line 226 [13.293070]
[11.1021]
[12.1078]
```
    more_str += ".";
```
Replacement in crawl-ref/source/ouch.cc at line 984 [13.1104358]
B:BD[13.1120880] → [8.214038:214082]
```
            if (!yesno("Die?", false, 'n'))
```
[13.1120880]
[13.1120919]
```
            if (!yesno("Die?", true, 'n'))
```

Insertion in crawl-ref/source/misc.cc at line 2412 [13.1933596]

[14.3457]

[8.252493]

    if (Options.stash_tracking && !crawl_state.arena)
    {
        StashTrack.update_visible_stashes(
            Options.stash_tracking == STM_ALL ? StashTracker::ST_AGGRESSIVE
                                              : StashTracker::ST_PASSIVE);
    }

Replacement in crawl-ref/source/menu.cc at line 337 [8.261322]
B:BD[7.3985] → [7.3985:4009]
```
        update_title();
```
[7.3985]
[7.4009]
```
//         update_title();
```

Replacement in crawl-ref/source/menu.cc at line 1096 [8.261322]

B:BD[15.1472] → [15.1472:1584]

            && (selected < first_entry || selected >= first_entry + pagesize)
            && recurse_depth > 0)

[15.1472]

[15.1584]

        && (selected < first_entry || selected >= first_entry + pagesize)
        && recurse_depth > 0)
    {

Replacement in crawl-ref/source/menu.cc at line 1100 [8.261322]
B:BD[15.1622] → [16.13365:13366]
[15.1622]
[15.1627]
```
    }
```
Replacement in crawl-ref/source/invent.cc at line 228 [13.2920632]
B:BD[13.2921656] → [17.773449:773501]
```
void InvEntry::add_class_hotkeys(const item_def &i)
```
[13.2921656]
[13.2921716]
```
static void _get_class_hotkeys(const int type, std::vector<char> &glyphs)
```
Replacement in crawl-ref/source/invent.cc at line 230 [13.2920632]
B:BD[13.2921718] → [17.773502:773527]
```
    switch (i.base_type)
```
[13.2921718]
[17.773527]
```
    switch (type)
```
Replacement in crawl-ref/source/invent.cc at line 233 [13.2920632]
B:BD[17.773552] → [17.773552:773577]
```
        add_hotkey('$');
```
[17.773552]
[17.773577]
```
        glyphs.push_back('$');
```
Replacement in crawl-ref/source/invent.cc at line 236 [13.2920632]
B:BD[17.773615] → [17.773615:773640]
```
        add_hotkey('(');
```
[17.773615]
[17.773640]
```
        glyphs.push_back('(');
```
Replacement in crawl-ref/source/invent.cc at line 239 [13.2920632]
B:BD[17.773677] → [17.773677:773702]
```
        add_hotkey(')');
```
[17.773677]
[17.773702]
```
        glyphs.push_back(')');
```
Replacement in crawl-ref/source/invent.cc at line 242 [13.2920632]
B:BD[17.773738] → [17.773738:773763]
```
        add_hotkey('[');
```
[17.773738]
[17.773763]
```
        glyphs.push_back('[');
```
Replacement in crawl-ref/source/invent.cc at line 245 [13.2920632]
B:BD[17.773798] → [17.773798:773823]
```
        add_hotkey('/');
```
[17.773798]
[17.773823]
```
        glyphs.push_back('/');
```
Replacement in crawl-ref/source/invent.cc at line 248 [13.2920632]
B:BD[17.773857] → [17.773857:773882]
```
        add_hotkey('%');
```
[17.773857]
[17.773882]
```
        glyphs.push_back('%');
```

Replacement in crawl-ref/source/invent.cc at line 251 [13.2920632]

B:BD[17.773917] → [17.773917:773967]

        add_hotkey('+');
        add_hotkey(':');

[17.773917]

[17.773967]

        glyphs.push_back('+');
        glyphs.push_back(':');

Replacement in crawl-ref/source/invent.cc at line 255 [13.2920632]
B:BD[17.774004] → [17.774004:774029]
```
        add_hotkey('?');
```
[17.774004]
[17.774029]
```
        glyphs.push_back('?');
```

Replacement in crawl-ref/source/invent.cc at line 258 [13.2920632]

B:BD[17.774068] → [18.2643:2699]

        add_hotkey(i.sub_type >= AMU_RAGE ? '"' : '=');

[17.774068]

[17.774124]

        glyphs.push_back('"');
        glyphs.push_back('=');

Replacement in crawl-ref/source/invent.cc at line 262 [13.2920632]
B:BD[17.774161] → [17.774161:774186]
```
        add_hotkey('!');
```
[17.774161]
[17.774186]
```
        glyphs.push_back('!');
```

Replacement in crawl-ref/source/invent.cc at line 265 [13.2920632]

B:BD[17.774222] → [17.774222:774273]

        add_hotkey('\\');
        add_hotkey('|');

[17.774222]

[17.774273]

        glyphs.push_back('\\');
        glyphs.push_back('|');

Replacement in crawl-ref/source/invent.cc at line 269 [13.2920632]
B:BD[17.774313] → [17.774313:774338]
```
        add_hotkey('}');
```
[17.774313]
[17.774338]
```
        glyphs.push_back('}');
```
Replacement in crawl-ref/source/invent.cc at line 272 [13.2920632]
B:BD[17.774375] → [17.774375:774400]
```
        add_hotkey('&');
```
[17.774375]
[17.774400]
```
        glyphs.push_back('&');
```

Insertion in crawl-ref/source/invent.cc at line 276 [13.2920632]

[17.774443]

    }
}
void InvEntry::add_class_hotkeys(const item_def &i)
{
    const int type = i.base_type;
    if (type == OBJ_JEWELLERY)
    {
        add_hotkey(i.sub_type >= AMU_RAGE ? '"' : '=');
        return;

Insertion in crawl-ref/source/invent.cc at line 287 [13.2920632]

[17.774449]


    std::vector<char> glyphs;
    _get_class_hotkeys(type, glyphs);
    for (unsigned int k = 0; k < glyphs.size(); ++k)
        add_hotkey(glyphs[k]);

Replacement in crawl-ref/source/invent.cc at line 733 [13.2920632]

B:BD[17.777285] → [17.777285:777357]

        add_entry( new MenuEntry( item_class_name(i), MEL_SUBTITLE ) );

[17.777285]

[17.777357]

        std::string subtitle = item_class_name(i);
#ifdef USE_TILE
        // For Tiles, mention the class selection shortcuts.
        if (is_set(MF_MULTISELECT) && inv_class[i] > 1)
        {
            std::vector<char> glyphs;
            _get_class_hotkeys(i, glyphs);
            if (!glyphs.empty())
            {
                const std::string misc = "Miscellaneous";
                subtitle += std::string(misc.length()
                                        - subtitle.length() + 1, ' ');
                subtitle += "(select all with <w>";
                for (unsigned int k = 0; k < glyphs.size(); ++k)
                     subtitle += glyphs[k];
                subtitle += "</w><blue>)";
            }
        }
#endif
        add_entry( new MenuEntry( subtitle, MEL_SUBTITLE ) );

Deletion in crawl-ref/source/directn.cc at line 563 [13.3697945]
B:BD[19.6726] → [19.6726:6773]
```
            std::vector<formatted_string> fss;
```
Insertion in crawl-ref/source/directn.cc at line 574 [13.3697945]
[20.3432]
[19.7068]
```
            std::vector<formatted_string> fss;
```
Replacement in crawl-ref/settings/init.txt at line 168 [13.4830895]
B:BD[21.4521] → [22.4440:4475]
```
auto_exclude = curse skull,Roxanne
```
[21.4521]
[23.232]
```
auto_exclude = curse skull,roxanne
```
Replacement in crawl-ref/settings/init.txt at line 328 [13.4830895]
B:BD[13.4838937] → [24.4958:4989]
B:BD[24.4989] → [25.3844:3875]
```
# autoinscribe = royal jell:=g
# autoinscribe = distortion:!w
```
[13.4838937]
[25.3875]
```
autoinscribe = distortion:!w
```
Insertion in crawl-ref/settings/init.txt at line 330 [13.4830895]
[25.3912]
[26.8091]
```
# autoinscribe = royal jell:=g
```

* Fix 2687930: Shorten the spell menu more, and don't call update_title()

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/tilesdl.cc at line 186 [4.19415]

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

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

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

Deletion in crawl-ref/source/stash.cc at line 1781 [8.147324]

Replacement in crawl-ref/source/stash.cc at line 1838 [8.147324]

Replacement in crawl-ref/source/stash.cc at line 1840 [8.147324]

Replacement in crawl-ref/source/spl-cast.cc at line 219 [13.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 224 [13.293070]

Insertion in crawl-ref/source/spl-cast.cc at line 226 [13.293070]

Replacement in crawl-ref/source/ouch.cc at line 984 [13.1104358]

Insertion in crawl-ref/source/misc.cc at line 2412 [13.1933596]

Replacement in crawl-ref/source/menu.cc at line 337 [8.261322]

Replacement in crawl-ref/source/menu.cc at line 1096 [8.261322]

Replacement in crawl-ref/source/menu.cc at line 1100 [8.261322]

Replacement in crawl-ref/source/invent.cc at line 228 [13.2920632]

Replacement in crawl-ref/source/invent.cc at line 230 [13.2920632]

Replacement in crawl-ref/source/invent.cc at line 233 [13.2920632]

Replacement in crawl-ref/source/invent.cc at line 236 [13.2920632]

Replacement in crawl-ref/source/invent.cc at line 239 [13.2920632]

Replacement in crawl-ref/source/invent.cc at line 242 [13.2920632]

Replacement in crawl-ref/source/invent.cc at line 245 [13.2920632]

Replacement in crawl-ref/source/invent.cc at line 248 [13.2920632]

Replacement in crawl-ref/source/invent.cc at line 251 [13.2920632]

Replacement in crawl-ref/source/invent.cc at line 255 [13.2920632]

Replacement in crawl-ref/source/invent.cc at line 258 [13.2920632]

Replacement in crawl-ref/source/invent.cc at line 262 [13.2920632]

Replacement in crawl-ref/source/invent.cc at line 265 [13.2920632]

Replacement in crawl-ref/source/invent.cc at line 269 [13.2920632]

Replacement in crawl-ref/source/invent.cc at line 272 [13.2920632]

Insertion in crawl-ref/source/invent.cc at line 276 [13.2920632]

Insertion in crawl-ref/source/invent.cc at line 287 [13.2920632]

Replacement in crawl-ref/source/invent.cc at line 733 [13.2920632]

Deletion in crawl-ref/source/directn.cc at line 563 [13.3697945]

Insertion in crawl-ref/source/directn.cc at line 574 [13.3697945]

Replacement in crawl-ref/settings/init.txt at line 168 [13.4830895]

Replacement in crawl-ref/settings/init.txt at line 328 [13.4830895]

Insertion in crawl-ref/settings/init.txt at line 330 [13.4830895]