fiddlerwoaroof/crawl - Change 3QMVUDNISBRQJZY76HDNCPB3L6J3Z6QIGFKSUI674QZB6NYZYI5AC

* Add description toggle (only '?' this time) into spellcasting menu and

make I use a loop as well, so that z?? and I are now functionally identical. (Which of course brings up the question of whether you really need an additional key to do this. :p)

Simplify a bit.

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

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

3QMVUDNISBRQJZY76HDNCPB3L6J3Z6QIGFKSUI674QZB6NYZYI5AC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spl-cast.h at line 49 [5.291319]
B:BD[5.291578] → [6.645:689]
```
int list_spells(bool toggle_with_I = true);
```
[5.291578]
[7.10934]
```
int list_spells(bool toggle_with_I = true, bool viewing = false);
```

Replacement in crawl-ref/source/spl-cast.h at line 52 [5.291319]

B:BD[8.318] → [8.318:369]

                     bool fail_rate_chk = false );

[8.318]

[5.291686]

                     bool fail_rate_chk = false);

Replacement in crawl-ref/source/spl-cast.cc at line 183 [5.293070]
B:BD[5.296045] → [6.691:727]
```
int list_spells(bool toggle_with_I)
```
[5.296045]
[9.1034]
```
int list_spells(bool toggle_with_I, bool viewing)
```

Replacement in crawl-ref/source/spl-cast.cc at line 192 [5.293070]

B:BD[2.428] → [2.428:495]

                " Your Spells                      Type          "

[2.428]

[2.495]

                " Your Spells                       Type          "

Replacement in crawl-ref/source/spl-cast.cc at line 194 [5.293070]

B:BD[2.546] → [2.546:613]

                " Your Spells                      Power         "

[2.546]

[2.613]

                " Your Spells                       Power         "

Replacement in crawl-ref/source/spl-cast.cc at line 203 [5.293070]

B:BD[10.1427] → [11.480:543]

            " Your Spells                      Type          "

[10.1427]

[11.543]

            " Your Spells                       Type          "

Replacement in crawl-ref/source/spl-cast.cc at line 205 [5.293070]

B:BD[11.590] → [11.590:653]

            " Your Spells                      Power         "

[11.590]

[11.653]

            " Your Spells                       Power         "

Insertion in crawl-ref/source/spl-cast.cc at line 210 [5.293070]
[9.1272]
[10.1662]
```
    spell_menu.set_tag("spell");
```
Insertion in crawl-ref/source/spl-cast.cc at line 212 [5.293070]
[10.1698]
[6.728]
```
    std::string more_str = "Press '!' ";
```

Deletion in crawl-ref/source/spl-cast.cc at line 216 [5.293070]

B:BD[6.757] → [6.757:786]

B:BD[6.786] → [3.269:376]

        spell_menu.set_more(
            formatted_string("Press '!' or 'I' to toggle spell view. Press spell slot for description."));

Insertion in crawl-ref/source/spl-cast.cc at line 217 [5.293070]
[6.899]
[6.899]
```
        more_str += "or 'I' ";
```
Replacement in crawl-ref/source/spl-cast.cc at line 219 [5.293070]
B:BD[6.905] → [6.905:914]
```
    else
```
[6.905]
[6.914]
```
    more_str += "to toggle spell view.";
    if (!viewing)
```

Replacement in crawl-ref/source/spl-cast.cc at line 222 [5.293070]

B:BD[6.920] → [6.920:1015]

        spell_menu.set_more(
            formatted_string("Press '!' to toggle spell view."));

[6.920]

[6.1015]

        spell_menu.allow_toggle = true;
        spell_menu.menu_action  = Menu::ACT_EXECUTE;
        more_str += " Press ''?' to toggle between spell selection"
                    " and description.";

Replacement in crawl-ref/source/spl-cast.cc at line 227 [5.293070]
B:BD[6.1021] → [6.1021:1022]
∅:D[12.290] → [13.248:281]
∅:D[6.1022] → [13.248:281]
B:BD[10.1698] → [13.248:281]
```
    spell_menu.set_tag("spell");
```
[6.1021]
[5.296151]
```
    spell_menu.set_more(formatted_string(more_str));
```
Replacement in crawl-ref/source/spl-cast.cc at line 243 [5.293070]
∅:D[14.1331] → [9.1612:1686]
B:BD[9.1612] → [9.1612:1686]
B:BD[9.1686] → [15.2303:2324]
∅:D[9.1709] → [5.297778:297784]
∅:D[15.2324] → [5.297778:297784]
B:BD[5.297778] → [5.297778:297784]
B:BD[5.297784] → [9.1710:1743]
```
    std::vector<MenuEntry*> sel = spell_menu.show();
    redraw_screen();
    if (sel.empty())
    {
        return 0;
    }
    else
```
[14.1331]
[9.1743]
```
    while (true)
```

Insertion in crawl-ref/source/spl-cast.cc at line 245 [5.293070]

[9.1749]

        std::vector<MenuEntry*> sel = spell_menu.show();
        redraw_screen();
        if (sel.empty())
            return 0;

Replacement in crawl-ref/source/spl-cast.cc at line 252 [5.293070]

B:BD[9.1827] → [9.1827:1862]

        return sel[0]->hotkeys[0];

[9.1827]

[5.298093]

        if (spell_menu.menu_action == Menu::ACT_EXAMINE)
        {
            describe_spell(get_spell_by_letter(sel[0]->hotkeys[0]));
            redraw_screen();
        }
        else
            return sel[0]->hotkeys[0];

Replacement in crawl-ref/source/spl-cast.cc at line 555 [5.293070]

B:BD[16.434] → [16.434:580]

    int keyin = list_spells();
    if ( isalpha(keyin) )
    {
        describe_spell(get_spell_by_letter(keyin));
        redraw_screen();
    }

[16.434]

[16.580]

    list_spells(true, true);

Replacement in crawl-ref/source/spl-cast.cc at line 558 [5.293070]
∅:D[16.583] → [5.306087:306140]
B:BD[5.306087] → [5.306087:306140]
```
// returns false if spell failed, and true otherwise
```
[16.583]
[17.1461]
```
// Returns false if spell failed, and true otherwise.
```

Replacement in crawl-ref/source/spl-cast.cc at line 586 [5.293070]

B:BD[5.306713] → [5.306713:306776]

        mpr( "Cast which spell ([?*] list)? ", MSGCH_PROMPT );

[5.306651]

[5.306776]

        mpr("Cast which spell? (? or * to list) ", MSGCH_PROMPT);

Replacement in crawl-ref/source/spl-cast.cc at line 598 [5.293070]

B:BD[5.306986] → [18.209:262]

            if ( isalpha(keyin) || keyin == ESCAPE )

[5.306986]

[5.307083]

            if (isalpha(keyin) || keyin == ESCAPE)

Deletion in crawl-ref/source/spl-cast.cc at line 604 [5.293070]
B:BD[5.307186] → [5.307186:307196]
```
        {
```
Deletion in crawl-ref/source/spl-cast.cc at line 605 [5.293070]
B:BD[5.307215] → [5.307215:307225]
```
        }
```
Deletion in crawl-ref/source/directn.cc at line 53 [5.3697945]
B:BD[19.2744] → [4.4260:4284]
```
// #include "tilesdl.h"
```

Replacement in crawl-ref/source/abl-show.h at line 69 [5.4492997]

B:BD[20.3518] → [21.10250:10358]

int choose_ability_menu(const std::vector<talent>& talents,
                        bool describe = false);

[20.3518]

[5.4493966]

int choose_ability_menu(const std::vector<talent>& talents);

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

B:BD[20.14461] → [4.4667:4743]

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

[20.14461]

[20.14537]

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

Replacement in crawl-ref/source/abl-show.cc at line 1942 [5.4494389]

B:BD[5.4531473] → [21.11895:11970]

int choose_ability_menu(const std::vector<talent>& talents, bool describe)

[5.4531473]

[20.16505]

int choose_ability_menu(const std::vector<talent>& talents)

Deletion in crawl-ref/source/abl-show.cc at line 1959 [5.4494389]

B:BD[22.7037] → [4.4950:5180]

    }
    else if (describe)
    {
        abil_menu.set_more(formatted_string::parse_string(
                           "Choose any ability to read its description, "
                           "or exit the menu with Escape."));

* Add description toggle (only '?' this time) into spellcasting menu and

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/spl-cast.h at line 49 [5.291319]

Replacement in crawl-ref/source/spl-cast.h at line 52 [5.291319]

Replacement in crawl-ref/source/spl-cast.cc at line 183 [5.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 192 [5.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 194 [5.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 203 [5.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 205 [5.293070]

Insertion in crawl-ref/source/spl-cast.cc at line 210 [5.293070]

Insertion in crawl-ref/source/spl-cast.cc at line 212 [5.293070]

Deletion in crawl-ref/source/spl-cast.cc at line 216 [5.293070]

Insertion in crawl-ref/source/spl-cast.cc at line 217 [5.293070]

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

Replacement in crawl-ref/source/spl-cast.cc at line 222 [5.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 227 [5.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 243 [5.293070]

Insertion in crawl-ref/source/spl-cast.cc at line 245 [5.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 252 [5.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 555 [5.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 558 [5.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 586 [5.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 598 [5.293070]

Deletion in crawl-ref/source/spl-cast.cc at line 604 [5.293070]

Deletion in crawl-ref/source/spl-cast.cc at line 605 [5.293070]

Deletion in crawl-ref/source/directn.cc at line 53 [5.3697945]

Replacement in crawl-ref/source/abl-show.h at line 69 [5.4492997]

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

Replacement in crawl-ref/source/abl-show.cc at line 1942 [5.4494389]

Deletion in crawl-ref/source/abl-show.cc at line 1959 [5.4494389]