diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-09-14 14:25:03 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-09-14 14:25:03 +0000 |
| commit | a58a5788137ad5c8e81286c534ade1e82840041c (patch) | |
| tree | 03b9dd0f4e90dd67c0a0b9cff0b64ef60ef92c15 /crawl-ref/source/spl-book.h | |
| parent | ce630aeacdfb03552b7750156df37ff2a3725826 (diff) | |
| download | crawl-ref-a58a5788137ad5c8e81286c534ade1e82840041c.tar.gz crawl-ref-a58a5788137ad5c8e81286c534ade1e82840041c.zip | |
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
Diffstat (limited to 'crawl-ref/source/spl-book.h')
| -rw-r--r-- | crawl-ref/source/spl-book.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/spl-book.h b/crawl-ref/source/spl-book.h index c9fea05191..b73b890baf 100644 --- a/crawl-ref/source/spl-book.h +++ b/crawl-ref/source/spl-book.h @@ -51,7 +51,7 @@ int read_book( item_def &item, read_book_action_type action ); bool player_can_memorise(const item_def &book); bool can_learn_spell(bool silent = false); bool learn_spell(); -bool learn_spell(spell_type spell, const item_def *book = NULL, +bool learn_spell(spell_type spell, int book = NUM_BOOKS, bool is_safest_book = true); bool player_can_read_spellbook( const item_def &book ); @@ -65,7 +65,7 @@ bool is_memorised(spell_type spell); bool you_cannot_memorise(spell_type spell); bool has_spells_to_memorise(bool silent = true); -std::vector<spell_type> get_mem_spell_list(); +std::vector<spell_type> get_mem_spell_list(std::vector<int> &books); int spellbook_contents( item_def &book, read_book_action_type action, formatted_string *fs = NULL ); |