fiddlerwoaroof/crawl - Change AEWYZVULWOTFODX6CL2ZMZPKCII5TLPK7HWBJVLRAH77XA22VKUQC

Fix multiple mouseclicks causing the same spell to be memorised several

times.

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

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

AEWYZVULWOTFODX6CL2ZMZPKCII5TLPK7HWBJVLRAH77XA22VKUQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/tilereg.cc at line 1867 [4.54399]

B:BD[3.1299] → [2.2472:2545]


//             if (!can_learn_spell(true) || !has_spells_to_memorise())

[3.1299]

[2.2545]

            else if (!can_learn_spell(true) || !has_spells_to_memorise())

Insertion in crawl-ref/source/spl-book.cc at line 1710 [6.397614]

[5.2048]

    if (already_learning_spell((int) specspell))
        return (false);

Insertion in crawl-ref/source/spl-book.cc at line 1773 [6.397614]

[7.3238]

[5.3277]

        // Deactivate choice from tile inventory.
        mouse_control mc(MOUSE_MODE_MORE);

Insertion in crawl-ref/source/spl-book.cc at line 1805 [6.397614]

[2.4863]

    // Deactivate choice from tile inventory.
    mouse_control mc(MOUSE_MODE_MORE);

Replacement in crawl-ref/source/spl-book.cc at line 1864 [6.397614]
B:BD[6.431477] → [6.431477:431530]
```
}                               // end which_spell()
```
[6.431477]
[8.190662]
```
}
```
Insertion in crawl-ref/source/delay.h at line 81 [6.3962990]
[9.13978]
[10.1442]
```
bool already_learning_spell(int spell);
```

Insertion in crawl-ref/source/delay.cc at line 304 [6.3963459]

[11.3226]

    if (type == DELAY_MEMORISE && already_learning_spell(parm1))
        return;

Insertion in crawl-ref/source/delay.cc at line 706 [6.3963459]

[12.15064]


bool already_learning_spell(int spell)
{
    if (!you_are_delayed())
        return (false);

Insertion in crawl-ref/source/delay.cc at line 712 [6.3963459]

[12.15065]

[13.14281]

    for (unsigned int i = 0; i < you.delay_queue.size(); ++i)
    {
        if (you.delay_queue[i].type != DELAY_MEMORISE)
            continue;
        if (you.delay_queue[i].parm1 == spell)
            return (true);
    }
    return (false);
}