fiddlerwoaroof/crawl - Change DWQDVEHZSTDVFS2GU24ZLIGJDA3M4767TB734JAQEAUVOOCLZ75AC

Changed list_spells() somewhat. It's now a slider wraparound menu.

(Also changed the meaning of what some of the flags do to slider_menu, the default behaviour should be unaltered.)

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

Created by haranp on May 8, 2007

DWQDVEHZSTDVFS2GU24ZLIGJDA3M4767TB734JAQEAUVOOCLZ75AC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spl-cast.cc at line 18 [3.293070]
B:BD[3.293567] → [3.293567:293645]
```
#include <ctype.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
```
[3.293567]
[3.293645]
```
#include <sstream>
#include <iomanip>
```
Replacement in crawl-ref/source/spl-cast.cc at line 129 [3.293070]
B:BD[3.294932] → [3.294932:294955]
```
char list_spells(void)
```
[3.294932]
[3.294955]
```
static std::string spell_full_description(spell_type spell)
```

Replacement in crawl-ref/source/spl-cast.cc at line 131 [3.293070]

B:BD[3.294957] → [3.294957:295076]

    int j;
    int lines = 0;
    unsigned int anything = 0;
    unsigned int i;
    int ki;
    bool already = false;

[3.294957]

[3.295076]

    std::ostringstream desc;

Replacement in crawl-ref/source/spl-cast.cc at line 133 [3.293070]
B:BD[3.295077] → [3.295077:295126]
B:BD[3.295126] → [4.27:64]
B:BD[3.295260] → [3.295260:295274]
```
    const int num_lines = get_number_of_lines();
    cursor_control coff(false);
    
    clrscr();
```
[3.295077]
[3.295274]
```
    desc << std::left;
```
Replacement in crawl-ref/source/spl-cast.cc at line 135 [3.293070]
B:BD[3.295275] → [5.124737:124835]
∅:D[5.124835] → [3.295373:295386]
B:BD[3.295373] → [3.295373:295386]
```
    cprintf( " Your Spells                      Type            Power         Success   Level" );
    lines++;
```
[3.295275]
[3.295386]
```
    // spell name
    desc << std::setw(30) << spell_title(spell);
```

Replacement in crawl-ref/source/spl-cast.cc at line 138 [3.293070]

B:BD[3.295387] → [3.295387:295416]

    for (j = 0; j < 52; j++)

[3.295387]

[3.295416]

    // spell schools
    bool already = false;
    for ( int i = 0; i <= SPTYP_LAST_EXPONENT; ++i)

Replacement in crawl-ref/source/spl-cast.cc at line 142 [3.293070]
B:BD[3.295422] → [3.295422:295457]
```
        if (lines > num_lines - 2)
```
[3.295422]
[3.295457]
```
        if (spell_typematch(spell, (1<<i)))
```

Replacement in crawl-ref/source/spl-cast.cc at line 144 [3.293070]

B:BD[3.295467] → [3.295467:295559]

            gotoxy(1, num_lines);
            cprintf("-more-");
            ki = getch();

[3.295467]

[3.295559]

            if (already)
                desc << '/';
            desc << spelltype_short_name(1 << i);
            already = true;
        }        
    }
    
    const int so_far = desc.str().length();
    if ( so_far < 46 )
        desc << std::string(46 - so_far, ' ');

Replacement in crawl-ref/source/spl-cast.cc at line 155 [3.293070]

B:BD[3.295560] → [3.295560:295604]

B:BD[3.295674] → [3.295674:295767]

B:BD[3.295837] → [3.295837:295936]

            if (ki == ESCAPE)
            {
                return (ESCAPE);
            }
            if (isalpha( ki ))
            {
                return (ki);
            }
            if (ki == 0)
                ki = getch();

[3.295560]

[3.295936]

    // spell power, fail rate, level
    desc << std::setw(14) << spell_power_string(spell)
         << std::setw(12) << failure_rate_to_string(spell_fail(spell))
         << spell_difficulty(spell);

Replacement in crawl-ref/source/spl-cast.cc at line 160 [3.293070]

B:BD[3.295937] → [3.295937:296044]

            lines = 0;
            clrscr();
            gotoxy(1, 1);
            anything = 0;
        }

[3.295937]

[3.296044]

    return desc.str();
}

Replacement in crawl-ref/source/spl-cast.cc at line 163 [3.293070]

B:BD[3.296045] → [3.296045:296093]

B:BD[3.296093] → [6.11122:11186]

        const char letter = index_to_letter(j);
        const spell_type spell  = get_spell_by_letter(letter);

[3.296045]

[3.296151]

char list_spells()
{
    slider_menu spell_menu(MF_SINGLESELECT | MF_ANYPRINTABLE);
    spell_menu.set_title(new MenuEntry(" Your Spells                      Type            Power         Success   Level", MEL_TITLE));
    spell_menu.set_highlighter(NULL);

Insertion in crawl-ref/source/spl-cast.cc at line 169 [3.293070]

[3.296152]

    for ( int i = 0; i < 52; ++i )
    {
        const char letter = index_to_letter(i);
        const spell_type spell = get_spell_by_letter(letter);

Replacement in crawl-ref/source/spl-cast.cc at line 175 [3.293070]

B:BD[3.296199] → [3.296199:296651]

B:BD[3.296651] → [5.124836:124905]

∅:D[5.124905] → [3.296708:296805]

B:BD[3.296708] → [3.296708:296805]

B:BD[3.296805] → [7.234:324]

B:BD[7.324] → [2.3089:3143]

∅:D[2.3143] → [7.403:425]

B:BD[7.403] → [7.403:425]

∅:D[7.425] → [3.296805:296876]

∅:D[5.125459] → [3.296805:296876]

B:BD[3.296805] → [3.296805:296876]

B:BD[3.296876] → [8.197:268]

∅:D[8.268] → [3.296923:296924]

B:BD[3.296923] → [3.296923:296924]

B:BD[3.297571] → [3.297571:297606]

B:BD[3.297606] → [9.1403:1460]

∅:D[9.1460] → [3.297669:297696]

B:BD[3.297669] → [3.297669:297696]

            anything++;
            if (lines > 0)
                cprintf(EOL);
            lines++;
            cprintf( " %c - %s", letter, spell_title( spell ) );
            gotoxy(35, wherey());
            already = false;
            for (i = 0; i <= SPTYP_LAST_EXPONENT; i++)
            {
                if (spell_typematch( spell, (1 << i) ))
                {
                    if (already)
                        cprintf( "/" );
                    cprintf( "%s", spelltype_short_name( 1 << i ) );
                    already = true;
                }
            }
            char sval[16];
            // 35--48 is the spell schools
            
            gotoxy(51, wherey());
            cprintf("%s", spell_power_string(spell));
                     
            //gotoxy(58, wherey());
            gotoxy(65, wherey());
            cprintf( "%s", failure_rate_to_string(spell_fail(spell)));
            gotoxy(77, wherey());
            itoa( spell_difficulty( spell ), sval, 10 );
            cprintf(sval);

[3.296199]

[3.297696]

            MenuEntry* me = new MenuEntry(spell_full_description(spell),
                                          MEL_ITEM, 0, letter);
            spell_menu.add_entry(me);

Replacement in crawl-ref/source/spl-cast.cc at line 179 [3.293070]

B:BD[3.297706] → [3.297706:297778]

    }                           // end of j loop
    if (anything > 0)

[3.297706]

[3.297778]

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

Replacement in crawl-ref/source/spl-cast.cc at line 185 [3.293070]

B:BD[3.297784] → [3.297784:297853]

B:BD[3.297919] → [3.297919:298003]

B:BD[3.298066] → [3.298066:298093]

        ki = getch();
        if (ki >= 'A' && ki <= 'z')
        {
            return (ki);
        }
        if (ki == 0)
            ki = getch();
        return (anything);

[3.297784]

[3.298093]

        return 0;
    }
    else
    {
        ASSERT(sel.size() == 1);
        ASSERT(sel[0]->hotkeys.size() == 1);
        return sel[0]->hotkeys[0];

Insertion in crawl-ref/source/spl-cast.cc at line 193 [3.293070]
[3.298099]
[3.298099]
```
}
```
Deletion in crawl-ref/source/spl-cast.cc at line 195 [3.293070]
B:BD[3.298158] → [3.298158:298261]
B:BD[3.298261] → [5.125460:125461]
```
    // was 35
    ki = getch();
    return (ki);
}                               // end list_spells()
```

Replacement in crawl-ref/source/newgame.cc at line 2188 [3.1132300]

B:BD[3.1185716] → [5.390861:390922]

        char_menu.set_flags(MF_EASY_EXIT | MF_SINGLESELECT);

[3.1185716]

[5.390922]

        char_menu.set_flags(MF_NOWRAP | MF_SINGLESELECT);

Replacement in crawl-ref/source/menu.h at line 260 [10.255942]
B:BD[5.562622] → [5.562622:562668]
```
    slider_menu(int flags = MF_SINGLESELECT);
```
[5.562622]
[5.562668]
```
    slider_menu(int flags = MF_SINGLESELECT | MF_NOWRAP);
```

Replacement in crawl-ref/source/menu.cc at line 663 [10.261322]

B:BD[5.570692] → [5.570692:570834]

    if (selected == 0 && 
            (key == CK_UP || key == CK_PGUP || key == '<' || key == ';') &&
            Menu::is_set(MF_EASY_EXIT))

[5.570692]

[5.570834]

    if (Menu::is_set(MF_NOWRAP) &&
        selected == 0 &&
        (key == CK_UP || key == CK_PGUP || key == '<' || key == ';'))

Replacement in crawl-ref/source/menu.cc at line 865 [10.261322]

B:BD[5.573987] → [5.573987:574074]

        nsel = 0;
    if (nsel >= (int) items.size())
        nsel = items.size() - 1;

[5.573987]

[5.574074]

    {
        if ( !is_set(MF_NOWRAP) )
            do {
                nsel += items.size();
            } while ( nsel < 0 );
        else
            nsel = 0;
    }
    if (nsel >= static_cast<int>(items.size()))
    {
        if ( !is_set(MF_NOWRAP) )
            do {
                nsel -= items.size();
            } while ( nsel >= static_cast<int>(items.size()) );
        else
            nsel = items.size() - 1;
    }

Changed list_spells() somewhat. It's now a slider wraparound menu.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/spl-cast.cc at line 18 [3.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 129 [3.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 131 [3.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 133 [3.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 135 [3.293070]