fiddlerwoaroof/crawl - Change SP6U7SNOVLSQ4XYH4VRB26VWE2KITUIWWUKDRAGOTT65XF6DAEYQC

Fix 2858572: tiles spell memorisation crashes.

Also handles dangerous spellbooks correctly now, prompts and all.

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

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

SP6U7SNOVLSQ4XYH4VRB26VWE2KITUIWWUKDRAGOTT65XF6DAEYQC

Dependencies

In channels

main

Change contents

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

∅:D[3.584] → [4.290:353]

B:BD[4.290] → [4.290:353]

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

[3.584]

[3.585]

        std::vector<int>  books;
        std::vector<spell_type> spells = get_mem_spell_list(books);

Insertion in crawl-ref/source/tilesdl.cc at line 1456 [5.19415]
[4.592]
[4.592]
```
            desc.special  = books[i];
```
Insertion in crawl-ref/source/tilereg.h at line 342 [5.45514]
[5.52606]
[5.52606]
```
    virtual int handle_spells_mouse(MouseEvent &event, int item_idx);
```

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

B:BD[5.93826] → [6.1800:1830]

            if (item.special)

[5.93826]

[7.7565]

            if (Options.tile_display == TDSP_INVENT && item.special)

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

B:BD[5.94505] → [8.2075:2149]

static int _handle_spells_mouse(MouseEvent &event, int idx, int item_idx)

[5.94505]

[8.2149]

int InventoryRegion::handle_spells_mouse(MouseEvent &event, int item_idx)

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

B:BD[8.2151] → [8.2151:2198]

    const spell_type spell = (spell_type) idx;

[8.2151]

[8.2198]

    const spell_type spell = (spell_type) m_items[item_idx].idx;

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

B:BD[4.2434] → [4.2434:2471]

            if (!learn_spell(spell))

[4.2434]

[9.1243]

            if (!learn_spell(spell, m_items[item_idx].special))

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

B:BD[4.2945] → [4.2945:3004]

        return _handle_spells_mouse(event, idx, item_idx);

[4.2945]

[8.2747]

        return handle_spells_mouse(event, item_idx);

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

B:BD[10.763] → [4.3618:3682]

bool learn_spell(spell_type spell, const item_def *book = NULL,

[10.763]

[4.3682]

bool learn_spell(spell_type spell, int book = NUM_BOOKS,

Replacement in crawl-ref/source/spl-book.h at line 68 [11.395672]
∅:D[3.2037] → [4.3729:3775]
B:BD[9.1957] → [4.3729:3775]
```
std::vector<spell_type> get_mem_spell_list();
```
[3.2037]
[11.397569]
```
std::vector<spell_type> get_mem_spell_list(std::vector<int> &books);
```
Replacement in crawl-ref/source/spl-book.cc at line 1499 [11.397614]
∅:D[2.912] → [4.3947:3992]
B:BD[4.3947] → [4.3947:3992]
```
std::vector<spell_type> get_mem_spell_list()
```
[2.912]
[4.3992]
```
std::vector<spell_type> get_mem_spell_list(std::vector<int> &books)
```

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

B:BD[4.4317] → [4.4317:4358]

        spells.push_back(mem_spells[i]);

[4.4317]

[4.4358]

    {
        spell_type spell = mem_spells[i];
        spells.push_back(spell);

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

[4.4359]

        spells_to_books::iterator it = book_hash.find(spell);
        books.push_back(it->second);
    }

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

B:BD[12.1695] → [12.1695:1844]

B:BD[12.1844] → [4.4434:4482]

    item_def book;
    book.base_type = OBJ_BOOKS;
    book.sub_type  = it->second;
    book.quantity  = 1;
    book.flags    |= ISFLAG_IDENT_MASK;
    return learn_spell(specspell, &book, true);

[12.1695]

[12.1891]

    return learn_spell(specspell, it->second, true);

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

B:BD[4.4562] → [4.4562:4661]

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

[4.4560]

[4.4661]

bool learn_spell(spell_type specspell, int book, bool is_safest_book)

Replacement in crawl-ref/source/spl-book.cc at line 1750 [11.397614]
B:BD[11.428521] → [4.4729:4790]
```
    if (chance > 0 && book && is_dangerous_spellbook(*book))
```
[11.428521]
[13.3039]
```
    if (chance > 0 && is_dangerous_spellbook(book))
```

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

[12.2984]

[4.4791]


        item_def fakebook;
        fakebook.base_type = OBJ_BOOKS;
        fakebook.sub_type  = book;
        fakebook.quantity  = 1;
        fakebook.flags    |= ISFLAG_IDENT_MASK;

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

B:BD[12.3209] → [4.4793:4861]

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

[12.3209]

[13.3237]

                               fakebook.name(DESC_NOCAP_THE).c_str());

Replacement in crawl-ref/source/spl-book.cc at line 1819 [11.397614]
B:BD[11.430172] → [4.4904:4953]
```
        if (book->sub_type == BOOK_NECRONOMICON)
```
[11.430172]
[11.430231]
```
        if (book == BOOK_NECRONOMICON)
```
Replacement in crawl-ref/source/spl-book.cc at line 1826 [11.397614]
B:BD[11.430465] → [4.4954:5006]
```
        else if (book->sub_type == BOOK_DEMONOLOGY)
```
[11.430465]
[11.430527]
```
        else if (book == BOOK_DEMONOLOGY)
```
Replacement in crawl-ref/source/spl-book.cc at line 1833 [11.397614]
B:BD[11.430776] → [4.5007:5062]
```
        else if (book->sub_type == BOOK_ANNIHILATIONS)
```
[11.430776]
[11.430841]
```
        else if (book == BOOK_ANNIHILATIONS)
```

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

B:BD[12.6975] → [4.7945:8014]

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

[12.6975]

[12.7045]

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

Replacement in crawl-ref/docs/tiles_creation.txt at line 9 [3.5603]

B:BD[3.5975] → [3.5975:6428]

You may want to download the latest source or even the trunk version. The
source/rltiles/ directory contains all tiles used in the game, and some more
that are currently unused. While you can create new tiles without having access
to existing ones, it can be useful to have them around for comparison. Also,
you'll probably want to compile them into the game to test your creations.
(You don't have to, though.) For compiling the game, see INSTALL.txt.

[3.5975]

[3.6428]

You may want to download the latest source or even the trunk version. Either
way, the source/rltiles/ directory contains all tiles used in the game, and
some more that are currently unused. While you can create new tiles without
having access to existing ones, it can be useful to have them around for
comparison. Also, you'll probably want to compile them into the game to test
your creations. (You don't have to, though.) For compiling the game, see
INSTALL.txt.
If you're going to change anything in the main code you'll probably want to
create a patch. See docs/patch_guide.txt for help with that.