fiddlerwoaroof/crawl - Change 6QVMISKCQYTVHBH2YZLOE77I72NIVUQN2D7ACECQ5TYMVC72LAWQC

Generalize the menu toggle from InvMenu to Menu and use it to properly

tie ability descriptions into the menu. Still haven't worked out how to update the titles, though. :(

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

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

6QVMISKCQYTVHBH2YZLOE77I72NIVUQN2D7ACECQ5TYMVC72LAWQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/tutorial.cc at line 2829 [5.5936]

B:BD[4.810] → [4.810:952]

        "e.g. nutrition or Magic power. If, from the main screen, you press "
        "<w>a!</w> you can read your abilities' descriptions.";

[4.810]

[4.952]

        "e.g. nutrition or Magic power. Press '<w>!</w>' or '<w>?</w>' to "
        "toggle between ability selection and description.";

Deletion in crawl-ref/source/tilesdl.cc at line 595 [6.19415]
B:BD[6.28891] → [2.237:306]
∅:D[2.306] → [6.28957:28958]
B:BD[6.28957] → [6.28957:28958]
```
//     m_region_tile->place_cursor(CURSOR_MOUSE, Region::NO_CURSOR);
```
Replacement in crawl-ref/source/stash.cc at line 1781 [8.147324]
B:BD[7.2211] → [7.2211:2246]
```
          menu_action(ACT_TRAVEL),
```
[7.2211]
[7.2246]
```
//          allow_toggle(true), menu_action(ACT_EXECUTE),
```
Deletion in crawl-ref/source/stash.cc at line 1788 [8.147324]
B:BD[7.2326] → [7.2326:2392]
```
    enum action { ACT_TRAVEL, ACT_EXAMINE, ACT_NUM } menu_action;
```

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

∅:D[9.6431] → [10.154:252]

B:BD[7.2643] → [10.154:252]

∅:D[10.252] → [7.2709:2777]

B:BD[7.2709] → [7.2709:2777]

                 "<lightgrey>  [<w>a-z</w>: %s  <w>?</w>: change action  <w>/</w>: change sort]",
                 menu_action == ACT_TRAVEL ? "travel" : "examine");

[9.6431]

[8.182435]

                 "<lightgrey>  [<w>a-z</w>: %s  <w>?</w>/<w>!</w>: change action  <w>/</w>: change sort]",
                 menu_action == ACT_EXECUTE ? "travel" : "examine");

Replacement in crawl-ref/source/stash.cc at line 1818 [8.147324]
B:BD[8.182666] → [8.182666:182692]
B:BD[8.182692] → [11.118052:118073]
B:BD[11.118073] → [7.2818:2877]
∅:D[7.2877] → [8.182766:182790]
B:BD[8.182766] → [8.182766:182790]
B:BD[8.182790] → [12.5962:5985]
∅:D[12.5985] → [7.2878:2909]
B:BD[8.182811] → [7.2878:2909]
```
    if (key == '?')
    {
        sel.clear();
        menu_action = (action)((menu_action+1) % ACT_NUM);
        update_title();
        return (true);
    }
    else if (key == '/')
```
[8.182666]
[7.2909]
```
    if (key == '/')
```

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

[8.183120]

[13.889]

    stashmenu.allow_toggle = true;
    stashmenu.menu_action = Menu::ACT_EXECUTE;

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

B:BD[8.185381] → [7.3448:3529]

    if (sel.size() == 1 && stashmenu.menu_action == StashSearchMenu::ACT_TRAVEL)

[8.185381]

[8.185443]

    if (sel.size() == 1 && stashmenu.menu_action == Menu::ACT_EXECUTE)

Replacement in crawl-ref/source/menu.h at line 268 [8.255942]

∅:D[14.2884] → [8.259591:259667]

B:BD[8.259591] → [8.259591:259667]

B:BD[8.259667] → [10.2776:2858]

    bool draw_title_suffix( const std::string &s, bool titlefirst = true );
    bool draw_title_suffix( const formatted_string &fs, bool titlefirst = true );

[14.2884]

[8.259667]

    bool draw_title_suffix(const std::string &s, bool titlefirst = true);
    bool draw_title_suffix(const formatted_string &fs, bool titlefirst = true);

Insertion in crawl-ref/source/menu.h at line 312 [8.255942]

[8.260223]

    bool allow_toggle;
    enum action { ACT_EXECUTE, ACT_EXAMINE, ACT_NUM } menu_action;

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

∅:D[15.2783] → [16.3649:3914]

B:BD[17.755] → [16.3649:3914]

B:BD[16.3914] → [15.2784:2830]

 : f_selitem(NULL), f_drawitem(NULL), f_keyfilter(NULL), title(NULL),
   flags(_flags), tag(tagname), first_entry(0), y_offset(0),
   pagesize(0), max_pagesize(0), more("-more-", true), items(),
   sel(), select_filter(), highlighter(new MenuHighlighter), num(-1),
   lastch(0), alive(false), last_selected(-1)

[15.2783]

[8.261668]

  : f_selitem(NULL), f_drawitem(NULL), f_keyfilter(NULL), allow_toggle(false),
    menu_action(ACT_EXAMINE), title(NULL), flags(_flags), tag(tagname),
    first_entry(0), y_offset(0), pagesize(0), max_pagesize(0),
    more("-more-", true), items(), sel(), select_filter(),
    highlighter(new MenuHighlighter), num(-1), lastch(0), alive(false),
    last_selected(-1)

Insertion in crawl-ref/source/menu.cc at line 333 [8.261322]

[18.128]

[9.13134]

    else if (allow_toggle && (keyin == '!' || keyin == '?'))
    {
        sel.clear();
        menu_action = (action)((menu_action+1) % ACT_NUM);
        update_title();
        return (true);
    }

Insertion in crawl-ref/source/menu.cc at line 831 [8.261322]
[11.568512]
[11.568512]

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

B:BD[19.1597] → [20.216:335]

    if (first_entry > 0 && items[first_entry-1]->level != MEL_TITLE &&
        items[first_entry]->level != MEL_TITLE)

[19.1597]

[19.1666]

    if (first_entry > 0 && items[first_entry-1]->level != MEL_TITLE
        && items[first_entry]->level != MEL_TITLE)

Deletion in crawl-ref/source/invent.h at line 126 [21.2919073]
B:BD[3.6303] → [3.6303:6392]
∅:D[3.6392] → [11.768689:768690]
∅:D[22.10464] → [11.768689:768690]
B:BD[11.768689] → [11.768689:768690]
```
    bool allow_toggle;
    enum action { ACT_TRAVEL, ACT_EXAMINE, ACT_NUM } menu_action;
```
Replacement in crawl-ref/source/invent.cc at line 302 [21.2920632]
B:BD[15.3164] → [3.6444:6518]
```
      title_annotate(NULL), allow_toggle(false), menu_action(ACT_EXAMINE)
```
[15.3164]
[22.10643]
```
      title_annotate(NULL)
```
Deletion in crawl-ref/source/invent.cc at line 753 [21.2920632]
B:BD[3.6548] → [3.6548:6683]
∅:D[3.6683] → [12.35802:35825]
B:BD[11.779145] → [12.35802:35825]
∅:D[12.35825] → [21.2922698:2922704]
∅:D[8.374785] → [21.2922698:2922704]
B:BD[21.2922698] → [21.2922698:2922704]
```
    else if (key == '!')
    {
        sel.clear();
        menu_action = (action)((menu_action+1) % ACT_NUM);
        update_title();
        return (true);
    }
```
Replacement in crawl-ref/source/directn.cc at line 53 [21.3697945]
B:BD[23.2744] → [3.6727:6749]
```
 #include "tilesdl.h"
```
[23.2744]
[23.2744]
```
// #include "tilesdl.h"
```

Replacement in crawl-ref/source/directn.cc at line 666 [21.3697945]

B:BD[3.8427] → [3.8427:8492]

            else // ACT_TRAVEL, here used to view database entry

[3.8427]

[3.8492]

            else // ACT_EXECUTE, here used to view database entry

Replacement in crawl-ref/source/directn.cc at line 679 [21.3697945]
B:BD[3.8723] → [3.8723:8754]
```
            else // ACT_TRAVEL
```
[3.8723]
[3.8754]
```
            else // ACT_EXECUTE -> travel to item
```

Insertion in crawl-ref/source/directn.cc at line 695 [21.3697945]

[24.2925]

#else
    tiles.place_cursor(CURSOR_TUTORIAL, Region::NO_CURSOR);
    tiles.clear_text_tags(TAG_TUTORIAL);

Replacement in crawl-ref/source/abl-show.cc at line 834 [21.4494389]
B:BD[25.14188] → [25.14188:14215]
```
    if ( talents.empty() )
```
[25.14188]
[21.4506658]
```
    if (talents.empty())
```

Replacement in crawl-ref/source/abl-show.cc at line 870 [21.4494389]

B:BD[25.14461] → [26.11195:11332]

        msg::streams(MSGCH_PROMPT) << "Use which ability? (? or * to list, ! "
                                      "for descriptions)"

[25.14461]

[25.14537]

        msg::streams(MSGCH_PROMPT) << "Use which ability? (? or * to list)"

Deletion in crawl-ref/source/abl-show.cc at line 882 [21.4494389]

B:BD[27.602] → [27.602:616]

∅:D[27.616] → [21.4507632:4507642]

∅:D[25.14722] → [21.4507632:4507642]

B:BD[21.4507632] → [21.4507632:4507642]

B:BD[21.4507642] → [26.11333:11688]

            }
        }
        else if (keyin == '!')
        {
            while (true)
            {
                selected = choose_ability_menu(talents, true);
                if (selected == -1)
                {
                    canned_msg( MSG_OK );
                    return (false);
                }
                _print_talent_description(talents[selected]);

Replacement in crawl-ref/source/abl-show.cc at line 1948 [21.4494389]

B:BD[27.642] → [27.642:703]

        new MenuEntry("  Ability                           "

[27.642]

[27.703]

        new MenuEntry("  Ability                            "

Replacement in crawl-ref/source/abl-show.cc at line 1951 [21.4494389]

B:BD[26.11974] → [26.11974:11992]

    if (describe)

[26.11974]

[26.11992]

    abil_menu.set_flags(MF_SINGLESELECT | MF_ANYPRINTABLE
                            | MF_ALWAYS_SHOW_MORE);
    if (Options.tutorial_left)

Deletion in crawl-ref/source/abl-show.cc at line 1956 [21.4494389]

B:BD[26.11998] → [26.11998:12203]

B:BD[26.12203] → [4.6706:6868]

        abil_menu.set_more(formatted_string::parse_string(
                                "Choose any ability to read its description, "
                                "or exit the menu with Escape."));
        abil_menu.set_flags(MF_SINGLESELECT | MF_ANYPRINTABLE |
                            MF_ALWAYS_SHOW_MORE);
    }
    else if (Options.tutorial_left)
    {

Replacement in crawl-ref/source/abl-show.cc at line 1959 [21.4494389]

∅:D[4.7037] → [26.12203:12317]

B:BD[26.12203] → [26.12203:12317]

        abil_menu.set_flags(MF_SINGLESELECT | MF_ANYPRINTABLE |
                            MF_ALWAYS_SHOW_MORE);

[4.7037]

[26.12317]

    }
    else if (describe)
    {
        abil_menu.set_more(formatted_string::parse_string(
                           "Choose any ability to read its description, "
                           "or exit the menu with Escape."));
    }
    else
    {
        abil_menu.set_more(formatted_string::parse_string(
                           "Press '<w>!</w>' or '<w>?</w>' to toggle "
                           "between ability selection and description."));

Insertion in crawl-ref/source/abl-show.cc at line 1973 [21.4494389]

[21.4531522]

[25.16711]

    abil_menu.allow_toggle = true;
    abil_menu.menu_action  = Menu::ACT_EXECUTE;

Replacement in crawl-ref/source/abl-show.cc at line 2011 [21.4494389]
B:BD[28.2097] → [28.2097:2154]
∅:D[29.1807] → [25.17801:17822]
∅:D[30.1926] → [25.17801:17822]
∅:D[28.2154] → [25.17801:17822]
B:BD[25.17801] → [25.17801:17822]
B:BD[25.17822] → [31.36219:36240]
```
    std::vector<MenuEntry*> sel = abil_menu.show(false);
    redraw_screen();
    if (sel.empty())
```
[21.4534917]
[21.4534939]
```
    while (true)
```

Replacement in crawl-ref/source/abl-show.cc at line 2013 [21.4494389]

B:BD[21.4534945] → [25.17846:17886]

        return -1;
    }
    else
    {

[21.4534945]

[25.17886]

        std::vector<MenuEntry*> sel = abil_menu.show(false);
        redraw_screen();
        if (sel.empty())
            return -1;

Replacement in crawl-ref/source/abl-show.cc at line 2020 [21.4494389]

B:BD[25.17964] → [25.17964:18022]

        return (*(reinterpret_cast<int*>(sel[0]->data)));

[25.17964]

[21.4535248]

        int selected = *(reinterpret_cast<int*>(sel[0]->data));
        if (abil_menu.menu_action == Menu::ACT_EXAMINE)
            _print_talent_description(talents[selected]);
        else
            return (*(reinterpret_cast<int*>(sel[0]->data)));

Generalize the menu toggle from InvMenu to Menu and use it to properly

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/tutorial.cc at line 2829 [5.5936]

Deletion in crawl-ref/source/tilesdl.cc at line 595 [6.19415]

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

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

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

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

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

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

Replacement in crawl-ref/source/menu.h at line 268 [8.255942]

Insertion in crawl-ref/source/menu.h at line 312 [8.255942]

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

Insertion in crawl-ref/source/menu.cc at line 333 [8.261322]

Insertion in crawl-ref/source/menu.cc at line 831 [8.261322]

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

Deletion in crawl-ref/source/invent.h at line 126 [21.2919073]

Replacement in crawl-ref/source/invent.cc at line 302 [21.2920632]

Deletion in crawl-ref/source/invent.cc at line 753 [21.2920632]

Replacement in crawl-ref/source/directn.cc at line 53 [21.3697945]