From aa0fd003178a75843f1162975bfc59d5e729ac10 Mon Sep 17 00:00:00 2001 From: haranp Date: Fri, 13 Apr 2007 20:13:50 +0000 Subject: Cleaned up spellbook handling code, fixes 1699962. Also fixed a bad bug with spell validity (good thing that spellbooks 1-4 are long, huh...) git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1300 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/spl-book.h | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) (limited to 'crawl-ref/source/spl-book.h') diff --git a/crawl-ref/source/spl-book.h b/crawl-ref/source/spl-book.h index 80631f1feb..a577b97f80 100644 --- a/crawl-ref/source/spl-book.h +++ b/crawl-ref/source/spl-book.h @@ -18,13 +18,6 @@ #include "menu.h" #include "FixVec.h" - -// used in dungeon.cc, it_use3.cc, spl-book.cc, spl-book.h - {dlb} -#define SPELLBOOK_SIZE 9 -// used in spl-book.cc, spl-book.h - {dlb} -#define NUMBER_SPELLBOOKS 60 - - // updated 24may2000 {dlb} /* *********************************************************************** * called from: dungeon - effects - shopping @@ -32,10 +25,6 @@ char book_rarity(unsigned char which_book); -// updated 24may2000 {dlb} -/* *********************************************************************** - * called from: it_use3 - item_use - spl-book - * *********************************************************************** */ bool is_valid_spell_in_book( unsigned int splbook, int spell ); @@ -52,13 +41,9 @@ unsigned char read_book( item_def &item, int action ); * *********************************************************************** */ bool learn_spell(void); - -// updated 24may2000 {dlb} -/* *********************************************************************** - * called from: it_use3 - item_use - spl-book - * *********************************************************************** */ spell_type which_spell_in_book(int sbook_type, int spl); +// returns amount practised (or -1 for abort) int staff_spell( int zap_device_2 ); bool undead_cannot_memorise(unsigned char spell, unsigned char being); -- cgit v1.2.3-54-g00ecf