fiddlerwoaroof/crawl - Change GSCSER2ZAH6ACCCMIUNKHN7OVGRVRTWVHBNYWLZGR7AQSOMF2TSQC

Adapt Matthew's new memorisation interface for tiles, using the same

display as for spellcasting. Also force a redraw() if the player clicked on a spell.

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

Created by j-p-e-g on September 12, 2009

GSCSER2ZAH6ACCCMIUNKHN7OVGRVRTWVHBNYWLZGR7AQSOMF2TSQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/tilesdl.cc at line 1440 [5.19415]

[4.326]

    if (Options.tile_display == TDSP_MEMORISE)
    {
        std::vector<spell_type> spells = get_mem_spell_list();
        for (unsigned int i = 0; i < spells.size(); ++i)
        {
            const spell_type spell = spells[i];
            InventoryTile desc;
            desc.tile     = tileidx_spell(spell);
            desc.idx      = (int) spell;
            desc.quantity = spell_difficulty(spell);
            if (spell_difficulty(spell) > you.experience_level
                || player_spell_levels() < spell_levels_required(spell))
            {
                desc.flag |= TILEI_FLAG_MELDED;
            }
            inv.push_back(desc);
        }
        m_region_inv->update(inv.size(), &inv[0]);
        return;
    }

Replacement in crawl-ref/source/tilesdl.cc at line 1516 [5.19415]
B:BD[5.40427] → [4.1593:1630]
```
    if (Options.tile_display_spells)
```
[5.40427]
[4.1630]
```
    if (Options.tile_display != TDSP_INVENT)
```
Replacement in crawl-ref/source/tilereg.cc at line 1626 [5.54399]
B:BD[6.3383] → [4.1911:1952]
```
        if (Options.tile_display_spells)
```
[6.3383]
[4.1952]
```
        if (Options.tile_display != TDSP_INVENT)
```
Replacement in crawl-ref/source/tilereg.cc at line 1636 [5.54399]
B:BD[3.889] → [3.889:906]
```
            else
```
[3.889]
[3.906]
```
            else if (Options.tile_display == TDSP_SPELLS)
```

Replacement in crawl-ref/source/tilereg.cc at line 1639 [5.54399]

B:BD[3.985] → [3.985:1055]

                         spell_difficulty(spell), spell_title(spell),

[3.985]

[3.1055]

                         spell_difficulty(spell),
                         spell_title(spell),

Insertion in crawl-ref/source/tilereg.cc at line 1642 [5.54399]

[3.1124]

                desc = info;
            }
            else // if (Options.tile_display == TDSP_MEMORISE)
            {
                snprintf(info, INFO_SIZE, "%s    (%s)    %d/%d spell slot%s",
                         spell_title(spell),
                         failure_rate_to_string(spell_fail(spell)),
                         spell_levels_required(spell),
                         player_spell_levels(),
                         spell_levels_required(spell) > 1 ? "s" : "");

Replacement in crawl-ref/source/tilereg.cc at line 1727 [5.54399]

B:BD[5.92152] → [7.240:285]

            if (Options.tile_display_spells)

[5.92152]

[7.285]

            if (Options.tile_display != TDSP_INVENT)

Replacement in crawl-ref/source/tilereg.cc at line 1754 [5.54399]

B:BD[2.482] → [2.482:531]

                if (Options.tile_display_spells)

[2.482]

[2.531]

                if (Options.tile_display == TDSP_INVENT)
                    m_buf_main.add(item.tile, x, y);
                else

Deletion in crawl-ref/source/tilereg.cc at line 1758 [5.54399]

B:BD[2.586] → [2.586:660]

                else
                    m_buf_main.add(item.tile, x, y);

Replacement in crawl-ref/source/tilereg.cc at line 1841 [5.54399]

B:BD[3.1211] → [3.1211:1243]

            if (!learn_spell())

[3.1211]

[3.1243]

            Options.tile_display = TDSP_MEMORISE;
            tiles.update_inventory();
            return CK_MOUSE_CMD;
        }
        if (Options.tile_display == TDSP_SPELLS)
        {
            you.last_clicked_item = item_idx;
            tiles.set_need_redraw();
            if (!cast_a_spell(true, spell))
                flush_input_buffer( FLUSH_ON_FAILURE );
        }
        else if (Options.tile_display == TDSP_MEMORISE)
        {
            you.last_clicked_item = item_idx;
            tiles.set_need_redraw();
            if (!learn_spell(spell))

Replacement in crawl-ref/source/tilereg.cc at line 1858 [5.54399]

B:BD[3.1299] → [3.1299:1332]

            return CK_MOUSE_CMD;

[3.1299]

[3.1332]


//             if (!can_learn_spell(true) || !has_spells_to_memorise())
            {
                // Jump back to spells list. (Really, this should only happen
                // if there aren't any other spells to memorise, but this
                // doesn't work for some reason.)
                Options.tile_display = TDSP_SPELLS;
                tiles.update_inventory();
            }

Deletion in crawl-ref/source/tilereg.cc at line 1868 [5.54399]
∅:D[3.1342] → [4.2288:2380]
B:BD[4.2288] → [4.2288:2380]
```
        if (!cast_a_spell(true, spell))
            flush_input_buffer( FLUSH_ON_FAILURE );
```

Replacement in crawl-ref/source/tilereg.cc at line 1903 [5.54399]

B:BD[4.2621] → [4.2621:2688]

B:BD[4.2688] → [3.1415:1579]

    if (m_items[item_idx].key == 0 && Options.tile_display_spells)
    {
        int key = _handle_spells_mouse(event, idx, item_idx);
        if (key != 0)
            you.last_clicked_item = item_idx;
        return (key);
    }

[4.2621]

[4.2747]

    if (m_items[item_idx].key == 0 && Options.tile_display != TDSP_INVENT)
        return _handle_spells_mouse(event, idx, item_idx);

Replacement in crawl-ref/source/tilereg.cc at line 2014 [5.54399]

B:BD[4.2887] → [4.2887:3021]

    if (flag & TILEI_FLAG_MELDED)
        tip = "You cannot cast this spell right now.";
    else
        tip = "[L-Click] Cast (z)";

[4.2887]

[4.3021]

    if (Options.tile_display == TDSP_SPELLS)
    {
        if (flag & TILEI_FLAG_MELDED)
            tip = "You cannot cast this spell right now.";
        else
            tip = "[L-Click] Cast (z)";
    }
    else if (Options.tile_display == TDSP_MEMORISE)
    {
        if (flag & TILEI_FLAG_MELDED)
            tip = "You don't have enough slots for this spell right now.";
        else
            tip = "[L-Click] Memorise (M)";
    }

Replacement in crawl-ref/source/tilereg.cc at line 2048 [5.54399]

B:BD[5.98358] → [4.3065:3121]

    if (display_actions && Options.tile_display_spells)

[5.98358]

[4.3121]

    if (display_actions && Options.tile_display != TDSP_INVENT)

Replacement in crawl-ref/source/tilereg.cc at line 2315 [5.54399]

B:BD[8.4279] → [4.3528:3595]

    if (m_items[item_idx].key == 0 && Options.tile_display_spells)

[8.4279]

[4.3595]

    if (m_items[item_idx].key == 0 && Options.tile_display != TDSP_INVENT)

Replacement in crawl-ref/source/spl-book.h at line 54 [11.395672]

B:BD[9.763] → [10.314:410]

bool learn_spell(spell_type spell, const item_def &book,
                 bool is_safest_book);

[9.763]

[12.162]

bool learn_spell(spell_type spell, const item_def *book = NULL,
                 bool is_safest_book = true);

Insertion in crawl-ref/source/spl-book.h at line 68 [11.395672]
[3.1957]
[11.397569]
```
std::vector<spell_type> get_mem_spell_list();
```

Replacement in crawl-ref/source/spl-book.cc at line 1459 [11.397614]

∅:D[3.2651] → [13.427:499]

B:BD[14.1982] → [13.427:499]

        mpr("You aren't experienced enough yet to memorise any of the "

[3.2651]

[14.2054]

        mpr("You aren't experienced enough to memorise any of the "

Replacement in crawl-ref/source/spl-book.cc at line 1480 [11.397614]
B:BD[3.2705] → [3.2705:2732]
```
    spell_list mem_spells;
```
[3.2705]
[3.2732]
```
    spell_list      mem_spells;
```

Replacement in crawl-ref/source/spl-book.cc at line 1482 [11.397614]

B:BD[3.2763] → [3.2763:2823]

    unsigned int num_unreadable;
    unsigned int num_race;

[3.2763]

[3.2823]

    unsigned int    num_unreadable;
    unsigned int    num_race;

Insertion in crawl-ref/source/spl-book.cc at line 1487 [11.397614]

[3.2907]


std::vector<spell_type> get_mem_spell_list()
{
    std::vector<spell_type> spells;

Insertion in crawl-ref/source/spl-book.cc at line 1492 [11.397614]

[3.2908]

[9.5837]

    spell_list      mem_spells;
    spells_to_books book_hash;
    unsigned int    num_unreadable;
    unsigned int    num_race;
    if (!_get_mem_list(mem_spells, book_hash, num_unreadable, num_race))
        return (spells);
    for (unsigned int i = 0; i < mem_spells.size(); i++)
        spells.push_back(mem_spells[i]);
    return (spells);
}

Insertion in crawl-ref/source/spl-book.cc at line 1553 [11.397614]
[15.1016]
[10.816]
```
    {
```
Insertion in crawl-ref/source/spl-book.cc at line 1558 [11.397614]
[15.1194]
[16.312]
```
    }
```
Insertion in crawl-ref/source/spl-book.cc at line 1561 [11.397614]
[15.1217]
[10.948]
```
    {
```
Insertion in crawl-ref/source/spl-book.cc at line 1566 [11.397614]
[15.1349]
[15.1349]
```
    }
```
Insertion in crawl-ref/source/spl-book.cc at line 1645 [11.397614]
[10.1302]
[10.1302]
```
        {
```
Insertion in crawl-ref/source/spl-book.cc at line 1648 [11.397614]
[10.1406]
[17.138315]
```
        }
```
Replacement in crawl-ref/source/spl-book.cc at line 1699 [11.397614]
B:BD[10.1844] → [10.1844:1891]
```
    return learn_spell(specspell, book, true);
```
[10.1844]
[10.1891]
```
    return learn_spell(specspell, &book, true);
```

Replacement in crawl-ref/source/spl-book.cc at line 1702 [11.397614]

B:BD[10.1894] → [10.1894:1993]

bool learn_spell(spell_type specspell, const item_def &book,
                 bool is_safest_book)

[10.1894]

[10.1993]

static bool _learn_spell_checks(spell_type specspell)

Insertion in crawl-ref/source/spl-book.cc at line 1737 [11.397614]

[10.2680]

[14.2917]

    return (true);
}
bool learn_spell(spell_type specspell, const item_def *book,
                 bool is_safest_book)
{
    if (!_learn_spell_checks(specspell))
        return (false);

Replacement in crawl-ref/source/spl-book.cc at line 1750 [11.397614]
B:BD[11.428521] → [10.2722:2774]
```
    if (chance > 0 && is_dangerous_spellbook(book))
```
[11.428521]
[14.3039]
```
    if (chance > 0 && book && is_dangerous_spellbook(*book))
```
Insertion in crawl-ref/source/spl-book.cc at line 1758 [11.397614]
[10.2984]
[10.2984]

Replacement in crawl-ref/source/spl-book.cc at line 1762 [11.397614]

B:BD[10.3209] → [10.3209:3276]

                               book.name(DESC_NOCAP_THE).c_str());

[10.3209]

[14.3237]

                               book->name(DESC_NOCAP_THE).c_str());

Replacement in crawl-ref/source/spl-book.cc at line 1793 [11.397614]
∅:D[15.1971] → [18.269:311]
B:BD[17.139140] → [18.269:311]
```
    if ( !yesno(info, true, 'n', false) )
```
[15.1971]
[11.429526]
```
    if (!yesno(info, true, 'n', false))
```
Replacement in crawl-ref/source/spl-book.cc at line 1813 [11.397614]
B:BD[11.430172] → [10.3326:3374]
```
        if (book.sub_type == BOOK_NECRONOMICON)
```
[11.430172]
[11.430231]
```
        if (book->sub_type == BOOK_NECRONOMICON)
```
Replacement in crawl-ref/source/spl-book.cc at line 1820 [11.397614]
B:BD[11.430465] → [10.3375:3426]
```
        else if (book.sub_type == BOOK_DEMONOLOGY)
```
[11.430465]
[11.430527]
```
        else if (book->sub_type == BOOK_DEMONOLOGY)
```

Replacement in crawl-ref/source/spl-book.cc at line 1827 [11.397614]

B:BD[11.430776] → [10.3427:3481]

        else if (book.sub_type == BOOK_ANNIHILATIONS)

[11.430776]

[11.430841]

        else if (book->sub_type == BOOK_ANNIHILATIONS)

Replacement in crawl-ref/source/initfile.cc at line 949 [11.2957258]
B:BD[19.5998] → [4.7400:7435]
```
    tile_display_spells   = false;
```
[19.5998]
[20.5853847]
```
    tile_display          = TDSP_INVENT;
```
Replacement in crawl-ref/source/externs.h at line 2233 [11.3270163]
B:BD[21.6206] → [4.7499:7536]
```
    bool        tile_display_spells;
```
[21.6206]
[20.5933151]
```
    tile_display_type  tile_display;
```

Insertion in crawl-ref/source/enum.h at line 3184 [11.3287960]

[21.6765]

[22.5241]


enum tile_display_type
{
    TDSP_INVENT = 0,
    TDSP_SPELLS,
    TDSP_MEMORISE
};

Replacement in crawl-ref/source/describe.cc at line 2463 [11.3736416]

B:BD[10.6975] → [10.6975:7045]

        if (!learn_spell(spelled, *item, false) || !you.turn_is_over)

[10.6975]

[10.7045]

        if (!learn_spell(spelled, item, false) || !you.turn_is_over)

Replacement in crawl-ref/source/acr.cc at line 1357 [11.4397395]

B:BD[4.8846] → [4.8846:8914]

        Options.tile_display_spells = !Options.tile_display_spells;

[4.8846]

[4.8914]

        if (Options.tile_display == TDSP_SPELLS)
            Options.tile_display = TDSP_INVENT;
        else
            Options.tile_display = TDSP_SPELLS;

Adapt Matthew's new memorisation interface for tiles, using the same

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/tilesdl.cc at line 1440 [5.19415]

Replacement in crawl-ref/source/tilesdl.cc at line 1516 [5.19415]

Replacement in crawl-ref/source/tilereg.cc at line 1626 [5.54399]

Replacement in crawl-ref/source/tilereg.cc at line 1636 [5.54399]

Replacement in crawl-ref/source/tilereg.cc at line 1639 [5.54399]

Insertion in crawl-ref/source/tilereg.cc at line 1642 [5.54399]

Replacement in crawl-ref/source/tilereg.cc at line 1727 [5.54399]

Replacement in crawl-ref/source/tilereg.cc at line 1754 [5.54399]

Deletion in crawl-ref/source/tilereg.cc at line 1758 [5.54399]

Replacement in crawl-ref/source/tilereg.cc at line 1841 [5.54399]

Replacement in crawl-ref/source/tilereg.cc at line 1858 [5.54399]

Deletion in crawl-ref/source/tilereg.cc at line 1868 [5.54399]

Replacement in crawl-ref/source/tilereg.cc at line 1903 [5.54399]

Replacement in crawl-ref/source/tilereg.cc at line 2014 [5.54399]

Replacement in crawl-ref/source/tilereg.cc at line 2048 [5.54399]

Replacement in crawl-ref/source/tilereg.cc at line 2315 [5.54399]

Replacement in crawl-ref/source/spl-book.h at line 54 [11.395672]

Insertion in crawl-ref/source/spl-book.h at line 68 [11.395672]

Replacement in crawl-ref/source/spl-book.cc at line 1459 [11.397614]

Replacement in crawl-ref/source/spl-book.cc at line 1480 [11.397614]

Replacement in crawl-ref/source/spl-book.cc at line 1482 [11.397614]

Insertion in crawl-ref/source/spl-book.cc at line 1487 [11.397614]

Insertion in crawl-ref/source/spl-book.cc at line 1492 [11.397614]

Insertion in crawl-ref/source/spl-book.cc at line 1553 [11.397614]

Insertion in crawl-ref/source/spl-book.cc at line 1558 [11.397614]

Insertion in crawl-ref/source/spl-book.cc at line 1561 [11.397614]

Insertion in crawl-ref/source/spl-book.cc at line 1566 [11.397614]

Insertion in crawl-ref/source/spl-book.cc at line 1645 [11.397614]

Insertion in crawl-ref/source/spl-book.cc at line 1648 [11.397614]

Replacement in crawl-ref/source/spl-book.cc at line 1699 [11.397614]

Replacement in crawl-ref/source/spl-book.cc at line 1702 [11.397614]

Insertion in crawl-ref/source/spl-book.cc at line 1737 [11.397614]

Replacement in crawl-ref/source/spl-book.cc at line 1750 [11.397614]

Insertion in crawl-ref/source/spl-book.cc at line 1758 [11.397614]

Replacement in crawl-ref/source/spl-book.cc at line 1762 [11.397614]

Replacement in crawl-ref/source/spl-book.cc at line 1793 [11.397614]

Replacement in crawl-ref/source/spl-book.cc at line 1813 [11.397614]

Replacement in crawl-ref/source/spl-book.cc at line 1820 [11.397614]

Replacement in crawl-ref/source/spl-book.cc at line 1827 [11.397614]

Replacement in crawl-ref/source/initfile.cc at line 949 [11.2957258]

Replacement in crawl-ref/source/externs.h at line 2233 [11.3270163]

Insertion in crawl-ref/source/enum.h at line 3184 [11.3287960]

Replacement in crawl-ref/source/describe.cc at line 2463 [11.3736416]

Replacement in crawl-ref/source/acr.cc at line 1357 [11.4397395]