fiddlerwoaroof/crawl - Change CXNFGQSYRTQMYHMRVCVRA4PDHLBNSIMXDUC3BXWQPZWEN6ZXLTMQC

Jump from the memorisation display back to spells if you cannot memorise

any further spells.

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

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

CXNFGQSYRTQMYHMRVCVRA4PDHLBNSIMXDUC3BXWQPZWEN6ZXLTMQC

Dependencies

In channels

main

Change contents

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

B:BD[4.1299] → [3.240:314]

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

[4.1299]

[6.2545]

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

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

B:BD[5.98358] → [6.3447:3511]

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

[5.98358]

[7.3121]

    if (Options.tile_display != TDSP_INVENT)

Replacement in crawl-ref/source/spl-book.h at line 67 [10.395672]

B:BD[8.565] → [9.1988:2037]

bool has_spells_to_memorise(bool silent = true);

[8.565]

[2.870]

bool has_spells_to_memorise(bool silent = true,
                            int current_spell = SPELL_NO_SPELL);

Replacement in crawl-ref/source/spl-book.cc at line 1304 [10.397614]

B:BD[4.2009] → [4.2009:2060]

                          bool just_check = false)

[4.2009]

[10.426286]

                          bool just_check = false,
                          spell_type current_spell = SPELL_NO_SPELL)

Replacement in crawl-ref/source/spl-book.cc at line 1400 [10.397614]

B:BD[11.3117] → [11.3117:3156]

        if (player_knows_spell(spell))

[11.3117]

[11.3156]

        if (spell == current_spell || player_knows_spell(spell))

Insertion in crawl-ref/source/spl-book.cc at line 1408 [10.397614]

[11.3315]

            int avail_slots = player_spell_levels();
            if (current_spell != SPELL_NO_SPELL)
                avail_slots -= spell_levels_required(current_spell);

Replacement in crawl-ref/source/spl-book.cc at line 1414 [10.397614]

B:BD[11.3409] → [11.3409:3484]

            else if (player_spell_levels() < spell_levels_required(spell))

[11.3409]

[11.3484]

            else if (avail_slots < spell_levels_required(spell))

Replacement in crawl-ref/source/spl-book.cc at line 1483 [10.397614]

B:BD[11.5837] → [9.2039:2080]

bool has_spells_to_memorise(bool silent)

[11.5837]

[4.2703]

// If current_spell is a valid spell, returns whether you'll be able to
// memorise any further spells once this one is committed to memory.
bool has_spells_to_memorise(bool silent, int current_spell)

Replacement in crawl-ref/source/spl-book.cc at line 1493 [10.397614]

B:BD[9.2155] → [9.2155:2189]

                         silent);

[9.2155]

[4.2905]

                         silent, (spell_type) current_spell);