fiddlerwoaroof/crawl - Change 25VJTGR3AWZJ7OHKYWS53VJ6TVMMU6UT7BA6V3QVVWDGI6FYKD7QC

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

Created by haranp on April 13, 2007

25VJTGR3AWZJ7OHKYWS53VJ6TVMMU6UT7BA6V3QVVWDGI6FYKD7QC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/spl-book.h at line 20 [3.395672]
B:BD[3.395943] → [3.395943:395944]

Deletion in crawl-ref/source/spl-book.h at line 21 [3.395672]

B:BD[3.395945] → [3.395945:396111]

// 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

Deletion in crawl-ref/source/spl-book.h at line 28 [3.395672]

B:BD[3.396382] → [3.396382:396608]

// updated 24may2000 {dlb}
/* ***********************************************************************
 * called from: it_use3 - item_use - spl-book
 * *********************************************************************** */

Deletion in crawl-ref/source/spl-book.h at line 43 [3.395672]
B:BD[3.397181] → [3.397181:397182]

Deletion in crawl-ref/source/spl-book.h at line 44 [3.395672]

B:BD[3.397183] → [3.397183:397409]

// updated 24may2000 {dlb}
/* ***********************************************************************
 * called from: it_use3 - item_use - spl-book
 * *********************************************************************** */

Insertion in crawl-ref/source/spl-book.h at line 46 [3.395672]
[3.397460]
[3.397460]
```
// returns amount practised (or -1 for abort)
```

Replacement in crawl-ref/source/spl-book.cc at line 43 [3.397614]

B:BD[3.398461] → [2.11667:11748]

static spell_type spellbook_template_array[NUMBER_SPELLBOOKS][SPELLBOOK_SIZE] =

[3.398461]

[3.398535]

#define SPELLBOOK_SIZE 8
#define NUMBER_SPELLBOOKS 60
static spell_type spellbook_template_array[NUMBER_SPELLBOOKS][SPELLBOOK_SIZE] =

Replacement in crawl-ref/source/spl-book.cc at line 49 [3.397614]
B:BD[3.398562] → [2.11749:11770]
∅:D[2.11770] → [3.398570:398593]
B:BD[3.398570] → [3.398570:398593]
```
    {SPELL_NO_SPELL,
     SPELL_MAGIC_DART,
```
[3.398562]
[3.398593]
```
    {SPELL_MAGIC_DART,
```
Replacement in crawl-ref/source/spl-book.cc at line 59 [3.397614]
B:BD[3.398792] → [2.11771:11792]
∅:D[2.11792] → [3.398800:398823]
B:BD[3.398800] → [3.398800:398823]
```
    {SPELL_NO_SPELL,
     SPELL_MAGIC_DART,
```
[3.398792]
[3.398823]
```
    {SPELL_MAGIC_DART,
```
Replacement in crawl-ref/source/spl-book.cc at line 69 [3.397614]
B:BD[3.399022] → [2.11793:11814]
∅:D[2.11814] → [3.399030:399053]
B:BD[3.399030] → [3.399030:399053]
```
    {SPELL_NO_SPELL,
     SPELL_MAGIC_DART,
```
[3.399022]
[3.399053]
```
    {SPELL_MAGIC_DART,
```
Replacement in crawl-ref/source/spl-book.cc at line 79 [3.397614]
B:BD[3.399286] → [2.11815:11836]
∅:D[2.11836] → [3.399294:399317]
B:BD[3.399294] → [3.399294:399317]
```
    {SPELL_NO_SPELL,
     SPELL_MAGIC_DART,
```
[3.399286]
[3.399317]
```
    {SPELL_MAGIC_DART,
```
Replacement in crawl-ref/source/spl-book.cc at line 89 [3.397614]
B:BD[3.399537] → [2.11837:11858]
∅:D[2.11858] → [3.399545:399568]
B:BD[3.399545] → [3.399545:399568]
```
    {SPELL_NO_SPELL,
     SPELL_MAGIC_DART,
```
[3.399537]
[3.399568]
```
    {SPELL_MAGIC_DART,
```
Replacement in crawl-ref/source/spl-book.cc at line 99 [3.397614]
B:BD[3.399769] → [2.11859:11880]
∅:D[2.11880] → [3.399777:399802]
B:BD[3.399777] → [3.399777:399802]
```
    {SPELL_NO_SPELL,
     SPELL_FLAME_TONGUE,
```
[3.399769]
[3.399802]
```
    {SPELL_FLAME_TONGUE,
```
Replacement in crawl-ref/source/spl-book.cc at line 109 [3.397614]
B:BD[3.399998] → [2.11881:11902]
∅:D[2.11902] → [3.400006:400025]
B:BD[3.400006] → [3.400006:400025]
```
    {SPELL_NO_SPELL,
     SPELL_FREEZE,
```
[3.399998]
[3.400025]
```
    {SPELL_FREEZE,
```
Replacement in crawl-ref/source/spl-book.cc at line 119 [3.397614]
B:BD[3.400234] → [2.11903:11924]
∅:D[2.11924] → [3.400242:400267]
B:BD[3.400242] → [3.400242:400267]
```
    {SPELL_NO_SPELL,
     SPELL_ABJURATION_I,
```
[3.400234]
[3.400267]
```
    {SPELL_ABJURATION_I,
```
Replacement in crawl-ref/source/spl-book.cc at line 129 [3.397614]
B:BD[3.400483] → [2.11925:11946]
∅:D[2.11946] → [3.400491:400513]
B:BD[3.400491] → [3.400491:400513]
```
    {SPELL_NO_SPELL,
     SPELL_EVAPORATE,
```
[3.400483]
[3.400513]
```
    {SPELL_EVAPORATE,
```
Replacement in crawl-ref/source/spl-book.cc at line 139 [3.397614]
B:BD[3.400725] → [2.11947:11968]
∅:D[2.11968] → [3.400733:400759]
B:BD[3.400733] → [3.400733:400759]
```
    {SPELL_NO_SPELL,
     SPELL_FREEZING_AURA,
```
[3.400725]
[3.400759]
```
    {SPELL_FREEZING_AURA,
```
Replacement in crawl-ref/source/spl-book.cc at line 150 [3.397614]
B:BD[3.400977] → [2.11969:11990]
∅:D[2.11990] → [3.400985:401017]
B:BD[3.400985] → [3.400985:401017]
```
    {SPELL_NO_SPELL,
     SPELL_DETECT_SECRET_DOORS,
```
[3.400977]
[3.401017]
```
    {SPELL_DETECT_SECRET_DOORS,
```
Replacement in crawl-ref/source/spl-book.cc at line 160 [3.397614]
B:BD[3.401227] → [2.11991:12012]
∅:D[2.12012] → [3.401235:401259]
B:BD[3.401235] → [3.401235:401259]
```
    {SPELL_NO_SPELL,
     SPELL_APPORTATION,
```
[3.401227]
[3.401259]
```
    {SPELL_APPORTATION,
```
Replacement in crawl-ref/source/spl-book.cc at line 170 [3.397614]
B:BD[3.401474] → [2.12013:12034]
∅:D[2.12034] → [3.401482:401505]
B:BD[3.401482] → [3.401482:401505]
```
    {SPELL_NO_SPELL,
     SPELL_LEVITATION,
```
[3.401474]
[3.401505]
```
    {SPELL_LEVITATION,
```
Replacement in crawl-ref/source/spl-book.cc at line 180 [3.397614]
B:BD[3.401719] → [2.12035:12056]
∅:D[2.12056] → [3.401727:401745]
B:BD[3.401727] → [3.401727:401745]
```
    {SPELL_NO_SPELL,
     SPELL_STING,
```
[3.401719]
[3.401745]
```
    {SPELL_STING,
```
Replacement in crawl-ref/source/spl-book.cc at line 190 [3.397614]
B:BD[3.401952] → [2.12057:12078]
∅:D[2.12078] → [3.401960:401982]
B:BD[3.401960] → [3.401960:401982]
```
    {SPELL_NO_SPELL,
     SPELL_DISCHARGE,
```
[3.401952]
[3.401982]
```
    {SPELL_DISCHARGE,
```
Replacement in crawl-ref/source/spl-book.cc at line 200 [3.397614]
B:BD[3.402168] → [2.12079:12100]
∅:D[2.12100] → [3.402176:402199]
B:BD[3.402176] → [3.402176:402199]
```
    {SPELL_NO_SPELL,
     SPELL_CORPSE_ROT,
```
[3.402168]
[3.402199]
```
    {SPELL_CORPSE_ROT,
```
Replacement in crawl-ref/source/spl-book.cc at line 210 [3.397614]
B:BD[3.402400] → [2.12101:12122]
∅:D[2.12122] → [3.402408:402436]
B:BD[3.402408] → [3.402408:402436]
```
    {SPELL_NO_SPELL,
     SPELL_CONFUSING_TOUCH,
```
[3.402400]
[3.402436]
```
    {SPELL_CONFUSING_TOUCH,
```
Replacement in crawl-ref/source/spl-book.cc at line 220 [3.397614]
B:BD[3.402614] → [2.12145:12166]
∅:D[2.12166] → [3.402622:402655]
B:BD[3.402622] → [3.402622:402655]
```
    {SPELL_NO_SPELL,
     SPELL_FULSOME_DISTILLATION,
```
[3.402614]
[3.402655]
```
    {SPELL_FULSOME_DISTILLATION,
```
Replacement in crawl-ref/source/spl-book.cc at line 230 [3.397614]
B:BD[3.402857] → [2.12167:12188]
∅:D[2.12188] → [3.402865:402887]
B:BD[3.402865] → [3.402865:402887]
```
    {SPELL_NO_SPELL,
     SPELL_SANDBLAST,
```
[3.402857]
[3.402887]
```
    {SPELL_SANDBLAST,
```
Replacement in crawl-ref/source/spl-book.cc at line 240 [3.397614]
B:BD[3.403093] → [2.12189:12210]
∅:D[2.12210] → [3.403101:403129]
B:BD[3.403101] → [3.403101:403129]
```
    {SPELL_NO_SPELL,
     SPELL_PROJECTED_NOISE,
```
[3.403093]
[3.403129]
```
    {SPELL_PROJECTED_NOISE,
```
Replacement in crawl-ref/source/spl-book.cc at line 251 [3.397614]
B:BD[3.403328] → [2.12211:12232]
∅:D[2.12232] → [3.403336:403359]
B:BD[3.403336] → [3.403336:403359]
```
    {SPELL_NO_SPELL,
     SPELL_FIRE_BRAND,
```
[3.403328]
[3.403359]
```
    {SPELL_FIRE_BRAND,
```
Replacement in crawl-ref/source/spl-book.cc at line 261 [3.397614]
B:BD[3.403559] → [2.12233:12254]
∅:D[2.12254] → [3.403567:403589]
B:BD[3.403567] → [3.403567:403589]
```
    {SPELL_NO_SPELL,
     SPELL_EVAPORATE,
```
[3.403559]
[3.403589]
```
    {SPELL_EVAPORATE,
```
Replacement in crawl-ref/source/spl-book.cc at line 271 [3.397614]
B:BD[3.403796] → [2.12255:12276]
∅:D[2.12276] → [3.403804:403830]
B:BD[3.403804] → [3.403804:403830]
```
    {SPELL_NO_SPELL,
     SPELL_CURE_POISON_I,
```
[3.403796]
[3.403830]
```
    {SPELL_CURE_POISON_I,
```
Replacement in crawl-ref/source/spl-book.cc at line 281 [3.397614]
B:BD[3.404034] → [2.12277:12298]
∅:D[2.12298] → [3.404042:404059]
B:BD[3.404042] → [3.404042:404059]
```
    {SPELL_NO_SPELL,
     SPELL_PAIN,
```
[3.404034]
[3.404059]
```
    {SPELL_PAIN,
```
Replacement in crawl-ref/source/spl-book.cc at line 291 [3.397614]
B:BD[3.404294] → [2.12299:12320]
∅:D[2.12320] → [3.404302:404332]
B:BD[3.404302] → [3.404302:404332]
```
    {SPELL_NO_SPELL,
     SPELL_SYMBOL_OF_TORMENT,
```
[3.404294]
[3.404332]
```
    {SPELL_SYMBOL_OF_TORMENT,
```
Replacement in crawl-ref/source/spl-book.cc at line 301 [3.397614]
B:BD[3.404541] → [2.12321:12342]
∅:D[2.12342] → [3.404549:404581]
B:BD[3.404549] → [3.404549:404581]
```
    {SPELL_NO_SPELL,
     SPELL_SUMMON_SMALL_MAMMAL,
```
[3.404541]
[3.404581]
```
    {SPELL_SUMMON_SMALL_MAMMAL,
```
Replacement in crawl-ref/source/spl-book.cc at line 311 [3.397614]
B:BD[3.404795] → [2.12343:12364]
∅:D[2.12364] → [3.404803:404825]
B:BD[3.404803] → [3.404803:404825]
```
    {SPELL_NO_SPELL,
     SPELL_BACKLIGHT,
```
[3.404795]
[3.404825]
```
    {SPELL_BACKLIGHT,
```
Replacement in crawl-ref/source/spl-book.cc at line 321 [3.397614]
B:BD[3.405123] → [2.12365:12386]
∅:D[2.12386] → [3.405131:405156]
B:BD[3.405131] → [3.405131:405156]
```
    {SPELL_NO_SPELL,
     SPELL_ABJURATION_I,
```
[3.405123]
[3.405156]
```
    {SPELL_ABJURATION_I,
```
Replacement in crawl-ref/source/spl-book.cc at line 331 [3.397614]
B:BD[3.405354] → [2.12387:12408]
∅:D[2.12408] → [3.405362:405380]
B:BD[3.405362] → [3.405362:405380]
```
    {SPELL_NO_SPELL,
     SPELL_SHOCK,
```
[3.405354]
[3.405380]
```
    {SPELL_SHOCK,
```
Replacement in crawl-ref/source/spl-book.cc at line 357 [3.397614]
B:BD[3.406361] → [2.12409:12430]
∅:D[2.12430] → [3.406420:406449]
B:BD[3.406420] → [3.406420:406449]
```
    {SPELL_NO_SPELL,
     SPELL_SUMMON_ELEMENTAL,
```
[3.406361]
[3.406449]
```
    {SPELL_SUMMON_ELEMENTAL,
```
Replacement in crawl-ref/source/spl-book.cc at line 368 [3.397614]
B:BD[3.406696] → [2.12431:12452]
∅:D[2.12452] → [3.406704:406736]
B:BD[3.406704] → [3.406704:406736]
```
    {SPELL_NO_SPELL,
     SPELL_DETECT_SECRET_DOORS,
```
[3.406696]
[3.406736]
```
    {SPELL_DETECT_SECRET_DOORS,
```
Replacement in crawl-ref/source/spl-book.cc at line 378 [3.397614]
B:BD[3.406941] → [2.12453:12474]
∅:D[2.12474] → [3.406978:407001]
B:BD[3.406978] → [3.406978:407001]
```
    {SPELL_NO_SPELL,
     SPELL_BANISHMENT,
```
[3.406941]
[4.137352]
```
    {SPELL_BANISHMENT,
```
Replacement in crawl-ref/source/spl-book.cc at line 388 [3.397614]
B:BD[3.407168] → [2.12475:12496]
∅:D[2.12496] → [3.407176:407200]
B:BD[3.407176] → [3.407176:407200]
```
    {SPELL_NO_SPELL,
     SPELL_SPIDER_FORM,
```
[3.407168]
[3.407200]
```
    {SPELL_SPIDER_FORM,
```
Replacement in crawl-ref/source/spl-book.cc at line 398 [3.397614]
B:BD[3.407451] → [2.12497:12518]
∅:D[2.12518] → [3.407459:407496]
B:BD[3.407459] → [3.407459:407496]
```
    {SPELL_NO_SPELL,
     SPELL_ISKENDERUNS_MYSTIC_BLAST,
```
[3.407451]
[3.407496]
```
    {SPELL_ISKENDERUNS_MYSTIC_BLAST,
```
Replacement in crawl-ref/source/spl-book.cc at line 408 [3.397614]
B:BD[3.407743] → [2.12519:12540]
∅:D[2.12540] → [3.407751:407784]
B:BD[3.407751] → [3.407751:407784]
```
    {SPELL_NO_SPELL,
     SPELL_SUBLIMATION_OF_BLOOD,
```
[3.407743]
[3.407784]
```
    {SPELL_SUBLIMATION_OF_BLOOD,
```
Deletion in crawl-ref/source/spl-book.cc at line 420 [3.397614]
∅:D[2.12562] → [3.408014:408035]
B:BD[3.408014] → [3.408014:408035]
```
     SPELL_NO_SPELL,
```
Replacement in crawl-ref/source/spl-book.cc at line 429 [3.397614]
B:BD[3.408218] → [2.12563:12584]
∅:D[2.12584] → [3.408226:408250]
B:BD[3.408226] → [3.408226:408250]
```
    {SPELL_NO_SPELL,
     SPELL_ENSLAVEMENT,
```
[3.408218]
[3.408250]
```
    {SPELL_ENSLAVEMENT,
```
Replacement in crawl-ref/source/spl-book.cc at line 439 [3.397614]
B:BD[3.408482] → [2.12585:12606]
∅:D[2.12606] → [3.408490:408516]
B:BD[3.408490] → [3.408490:408516]
```
    {SPELL_NO_SPELL,
     SPELL_FRAGMENTATION,
```
[3.408482]
[3.408516]
```
    {SPELL_FRAGMENTATION,
```
Replacement in crawl-ref/source/spl-book.cc at line 451 [3.397614]
B:BD[3.408821] → [2.12607:12628]
∅:D[2.12628] → [3.408829:408852]
B:BD[3.408829] → [3.408829:408852]
```
    {SPELL_NO_SPELL,
     SPELL_SURE_BLADE,
```
[3.408821]
[3.408852]
```
    {SPELL_SURE_BLADE,
```
Replacement in crawl-ref/source/spl-book.cc at line 461 [3.397614]
B:BD[3.409053] → [2.12629:12650]
∅:D[2.12650] → [3.409061:409083]
B:BD[3.409061] → [3.409061:409083]
```
    {SPELL_NO_SPELL,
     SPELL_SANDBLAST,
```
[3.409053]
[3.409083]
```
    {SPELL_SANDBLAST,
```
Replacement in crawl-ref/source/spl-book.cc at line 472 [3.397614]
B:BD[3.409282] → [2.12651:12672]
∅:D[2.12672] → [3.409290:409325]
B:BD[3.409290] → [3.409290:409325]
```
    {SPELL_NO_SPELL,
     SPELL_MAXWELLS_SILVER_HAMMER,
```
[3.409282]
[3.409325]
```
    {SPELL_MAXWELLS_SILVER_HAMMER,
```
Deletion in crawl-ref/source/spl-book.cc at line 490 [3.397614]
B:BD[3.409683] → [3.409683:409704]
```
     SPELL_NO_SPELL,
```
Replacement in crawl-ref/source/spl-book.cc at line 492 [3.397614]
B:BD[3.409741] → [2.12695:12716]
∅:D[2.12716] → [3.409749:409778]
B:BD[3.409749] → [3.409749:409778]
```
    {SPELL_NO_SPELL,
     SPELL_DETECT_CREATURES,
```
[3.409741]
[3.409778]
```
    {SPELL_DETECT_CREATURES,
```
Replacement in crawl-ref/source/spl-book.cc at line 502 [3.397614]
B:BD[3.409974] → [2.12717:12738]
∅:D[2.12738] → [3.409982:410007]
B:BD[3.409982] → [3.409982:410007]
```
    {SPELL_NO_SPELL,
     SPELL_ANIMATE_DEAD,
```
[3.409974]
[3.410007]
```
    {SPELL_ANIMATE_DEAD,
```
Replacement in crawl-ref/source/spl-book.cc at line 512 [3.397614]
B:BD[3.410248] → [2.12739:12760]
∅:D[2.12760] → [3.410256:410284]
B:BD[3.410256] → [3.410256:410284]
```
    {SPELL_NO_SPELL,
     SPELL_CONFUSING_TOUCH,
```
[3.410248]
[3.410284]
```
    {SPELL_CONFUSING_TOUCH,
```
Replacement in crawl-ref/source/spl-book.cc at line 523 [3.397614]
B:BD[3.410530] → [2.12761:12782]
∅:D[2.12782] → [3.410538:410569]
B:BD[3.410538] → [3.410538:410569]
```
    {SPELL_NO_SPELL,
     SPELL_SUMMON_BUTTERFLIES,
```
[3.410530]
[3.410569]
```
    {SPELL_SUMMON_BUTTERFLIES,
```
Replacement in crawl-ref/source/spl-book.cc at line 534 [3.397614]
B:BD[3.410843] → [2.12783:12804]
∅:D[2.12804] → [3.410851:410883]
B:BD[3.410851] → [3.410851:410883]
```
    {SPELL_NO_SPELL,
     SPELL_SUMMON_SMALL_MAMMAL,
```
[3.410843]
[3.410883]
```
    {SPELL_SUMMON_SMALL_MAMMAL,
```
Replacement in crawl-ref/source/spl-book.cc at line 545 [3.397614]
B:BD[3.411118] → [2.12805:12826]
∅:D[2.12826] → [3.411126:411144]
B:BD[3.411126] → [3.411126:411144]
```
    {SPELL_NO_SPELL,
     SPELL_STING,
```
[3.411118]
[3.411144]
```
    {SPELL_STING,
```
Deletion in crawl-ref/source/spl-book.cc at line 557 [3.397614]
∅:D[2.12870] → [3.411352:411373]
B:BD[3.411352] → [3.411352:411373]
```
     SPELL_NO_SPELL,
```
Deletion in crawl-ref/source/spl-book.cc at line 568 [3.397614]
∅:D[2.12892] → [3.411556:411577]
B:BD[3.411556] → [3.411556:411577]
```
     SPELL_NO_SPELL,
```
Replacement in crawl-ref/source/spl-book.cc at line 578 [3.397614]
B:BD[3.411812] → [2.12893:12914]
∅:D[2.12914] → [3.411820:411840]
B:BD[3.411820] → [3.411820:411840]
```
    {SPELL_NO_SPELL,
     SPELL_SMITING,
```
[3.411812]
[3.411840]
```
    {SPELL_SMITING,
```
Replacement in crawl-ref/source/spl-book.cc at line 588 [3.397614]
B:BD[3.412026] → [2.12915:12936]
∅:D[2.12936] → [3.412034:412059]
B:BD[3.412034] → [3.412034:412059]
```
    {SPELL_NO_SPELL,
     SPELL_ABJURATION_I,
```
[3.412026]
[3.412059]
```
    {SPELL_ABJURATION_I,
```
Replacement in crawl-ref/source/spl-book.cc at line 598 [3.397614]
B:BD[3.412250] → [2.12937:12958]
∅:D[2.12958] → [3.412258:412282]
B:BD[3.412258] → [3.412258:412282]
```
    {SPELL_NO_SPELL,
     SPELL_THROW_FLAME,
```
[3.412250]
[3.412282]
```
    {SPELL_THROW_FLAME,
```
Replacement in crawl-ref/source/spl-book.cc at line 608 [3.397614]
B:BD[3.412474] → [2.12959:12980]
∅:D[2.12980] → [3.412482:412506]
B:BD[3.412482] → [3.412482:412506]
```
    {SPELL_NO_SPELL,
     SPELL_THROW_FROST,
```
[3.412474]
[3.412506]
```
    {SPELL_THROW_FROST,
```
Replacement in crawl-ref/source/spl-book.cc at line 618 [3.397614]
B:BD[3.412700] → [2.12981:13002]
∅:D[2.13002] → [3.412708:412733]
B:BD[3.412708] → [3.412708:412733]
```
    {SPELL_NO_SPELL,
     SPELL_BOLT_OF_IRON,
```
[3.412700]
[3.412733]
```
    {SPELL_BOLT_OF_IRON,
```
Replacement in crawl-ref/source/spl-book.cc at line 628 [3.397614]
B:BD[3.412927] → [2.13003:13024]
∅:D[2.13024] → [3.412935:412966]
B:BD[3.412935] → [3.412935:412966]
```
    {SPELL_NO_SPELL,
     SPELL_BOLT_OF_INACCURACY,
```
[3.412927]
[3.412966]
```
    {SPELL_BOLT_OF_INACCURACY,
```
Replacement in crawl-ref/source/spl-book.cc at line 638 [3.397614]
B:BD[3.413159] → [2.13025:13046]
∅:D[2.13046] → [3.413167:413192]
B:BD[3.413167] → [3.413167:413192]
```
    {SPELL_NO_SPELL,
     SPELL_ABJURATION_I,
```
[3.413159]
[3.413192]
```
    {SPELL_ABJURATION_I,
```
Replacement in crawl-ref/source/spl-book.cc at line 648 [3.397614]
B:BD[3.413401] → [2.13047:13068]
∅:D[2.13068] → [3.413409:413441]
B:BD[3.413409] → [3.413409:413441]
```
    {SPELL_NO_SPELL,
     SPELL_DETECT_SECRET_DOORS,
```
[3.413401]
[3.413441]
```
    {SPELL_DETECT_SECRET_DOORS,
```
Replacement in crawl-ref/source/spl-book.cc at line 658 [3.397614]
B:BD[3.413641] → [2.13069:13090]
∅:D[2.13090] → [3.413649:413674]
B:BD[3.413649] → [3.413649:413674]
```
    {SPELL_NO_SPELL,
     SPELL_ABJURATION_I,
```
[3.413641]
[3.413674]
```
    {SPELL_ABJURATION_I,
```
Replacement in crawl-ref/source/spl-book.cc at line 668 [3.397614]
B:BD[3.413884] → [2.13091:13112]
∅:D[2.13112] → [3.413892:413913]
B:BD[3.413892] → [3.413892:413913]
```
    {SPELL_NO_SPELL,
     SPELL_STRIKING,
```
[3.413884]
[3.413913]
```
    {SPELL_STRIKING,
```

Replacement in crawl-ref/source/spl-book.cc at line 679 [3.397614]

B:BD[3.414072] → [2.13113:13231]

static void spellbook_template(
    int sbook_type,
    FixedVector < spell_type, SPELLBOOK_SIZE > &sbtemplate_pass )

[3.414072]

[3.414200]

spell_type which_spell_in_book(int sbook_type, int spl)

Replacement in crawl-ref/source/spl-book.cc at line 683 [3.397614]

B:BD[3.414279] → [3.414279:414640]

B:BD[3.414640] → [2.13232:13288]

∅:D[2.13288] → [3.414689:414691]

B:BD[3.414689] → [3.414689:414691]

B:BD[3.414691] → [2.13289:13368]

∅:D[2.13368] → [3.414763:414847]

B:BD[3.414763] → [3.414763:414847]


    // no point doing anything if tome of destruction or a manual
    if (sbook_type == BOOK_DESTRUCTION || sbook_type == BOOK_MANUAL)
        return;
    for (int i = 0; i < SPELLBOOK_SIZE; i++)    //jmf: was i = 1
    {
        sbtemplate_pass[i] = spellbook_template_array[sbook_type][i];
    }
}                               // end spellbook_template()
spell_type which_spell_in_book(int sbook_type, int spl)
{
    FixedVector < spell_type, SPELLBOOK_SIZE > wsib_pass;      // was 10 {dlb}
    spellbook_template(sbook_type, wsib_pass);
    return (wsib_pass[ spl + 1 ]);

[3.414279]

[3.414847]

    return spellbook_template_array[sbook_type][spl];

Deletion in crawl-ref/source/spl-book.cc at line 691 [3.397614]
B:BD[3.414981] → [2.13369:13445]
```
    FixedVector<spell_type, SPELLBOOK_SIZE> spell_types;    // was 10 {dlb}
```
Deletion in crawl-ref/source/spl-book.cc at line 713 [3.397614]
B:BD[3.415672] → [3.415672:415718]
```
    spellbook_template( type, spell_types );
```
Replacement in crawl-ref/source/spl-book.cc at line 723 [3.397614]
B:BD[3.415968] → [3.415968:416009]
```
    for (j = 1; j < SPELLBOOK_SIZE; j++)
```
[3.415968]
[3.416009]
```
    for (j = 0; j < SPELLBOOK_SIZE; j++)
```

Replacement in crawl-ref/source/spl-book.cc at line 725 [3.397614]

B:BD[3.416015] → [3.416015:416061]

        if (spell_types[j] == SPELL_NO_SPELL)

[3.416015]

[3.416061]

        spell_type stype = which_spell_in_book(type, j);
        if (stype == SPELL_NO_SPELL)

Replacement in crawl-ref/source/spl-book.cc at line 734 [3.397614]

B:BD[3.416198] → [3.416198:416258]

            knowsSpell = (you.spells[i] == spell_types[j]);

[3.416198]

[3.416258]

            knowsSpell = (you.spells[i] == stype);

Replacement in crawl-ref/source/spl-book.cc at line 737 [3.397614]

B:BD[3.416269] → [3.416269:416408]

        const int level_diff = spell_difficulty( spell_types[j] );
        const int levels_req = spell_levels_required( spell_types[j] );

[3.416269]

[3.416408]

        const int level_diff = spell_difficulty( stype );
        const int levels_req = spell_levels_required( stype );

Replacement in crawl-ref/source/spl-book.cc at line 777 [3.397614]

B:BD[3.417283] → [4.137688:137746]

        out.cprintf( "%s", spell_title(spell_types[j]) );

[3.417283]

[5.189701]

        out.cprintf( "%s", spell_title(stype) );

Replacement in crawl-ref/source/spl-book.cc at line 789 [3.397614]

B:BD[3.417576] → [3.417576:417639]

                if (spell_typematch( spell_types[j], 1 << i ))

[3.417576]

[3.417639]

                if (spell_typematch( stype, 1 << i ))

Replacement in crawl-ref/source/spl-book.cc at line 945 [3.397614]

B:BD[3.420740] → [2.13446:13501]

∅:D[2.13501] → [3.420788:420917]

B:BD[3.420788] → [3.420788:420917]

    FixedVector< spell_type, SPELLBOOK_SIZE >  spells;
    spellbook_template( you.inv[ splbook ].sub_type, spells );
    if (spells[ spell ] != SPELL_NO_SPELL)
        return true;

[3.420740]

[3.420917]

    return which_spell_in_book(splbook, spell) != SPELL_NO_SPELL;
}

Deletion in crawl-ref/source/spl-book.cc at line 948 [3.397614]
B:BD[3.420918] → [3.420918:421001]
```
    return false;
}                               // end is_valid_spell_in_book()
```
Replacement in crawl-ref/source/spl-book.cc at line 1156 [3.397614]
B:BD[3.426738] → [3.426738:426806]
```
    if (spell < 'A' || (spell > 'Z' && spell < 'a') || spell > 'z')
```
[3.426738]
[3.426806]
```
    if ( !isalpha(spell) )
```

Replacement in crawl-ref/source/spl-book.cc at line 1165 [3.397614]

B:BD[4.138162] → [4.138162:138210]

        !is_valid_spell_in_book( book, index ))

[4.138162]

[4.138210]

        !is_valid_spell_in_book( you.inv[book].sub_type, index ))

Deletion in crawl-ref/source/spl-book.cc at line 1313 [3.397614]
B:BD[5.191014] → [2.13581:13640]
∅:D[2.13640] → [5.191066:191111]
B:BD[5.191066] → [5.191066:191111]
```
    FixedVector< spell_type, SPELLBOOK_SIZE >  spell_list;
    spellbook_template( type, spell_list );
```

Replacement in crawl-ref/source/spl-book.cc at line 1314 [3.397614]

B:BD[5.191135] → [5.191135:191208]

    for (num_spells = 0; num_spells < SPELLBOOK_SIZE - 1; num_spells++)

[5.191135]

[5.191208]

    for (int i = 0; i < SPELLBOOK_SIZE; num_spells++)

Replacement in crawl-ref/source/spl-book.cc at line 1316 [3.397614]

B:BD[5.191214] → [5.191214:191274]

        if (spell_list[ num_spells + 1 ] == SPELL_NO_SPELL)

[5.191214]

[5.191274]

        if (is_valid_spell_in_book(type, i))
            ++num_spells;
        else

Replacement in crawl-ref/source/spl-book.cc at line 1321 [3.397614]
B:BD[5.191299] → [5.191299:191324]
```
    return (num_spells);
```
[5.191299]
[4.139633]
```
    return num_spells;
```
Replacement in crawl-ref/source/spl-book.cc at line 1347 [3.397614]
B:BD[4.140209] → [2.13668:13727]
∅:D[2.13727] → [3.431678:431679]
B:BD[3.431678] → [3.431678:431679]
```
    FixedVector< spell_type, SPELLBOOK_SIZE >  spell_list;
```
[4.140209]
[3.431679]
```
    item_def& istaff(you.inv[staff]);
```
Replacement in crawl-ref/source/spl-book.cc at line 1349 [3.397614]
B:BD[3.431727] → [3.431727:431778]
```
    const int type = you.inv[staff].sub_type + 40;
```
[3.431727]
[3.431778]
```
    const int type = istaff.sub_type + 40;
```
Replacement in crawl-ref/source/spl-book.cc at line 1358 [3.397614]
B:BD[3.432052] → [4.140383:140435]
```
    const int staff_type = you.inv[staff].sub_type;
```
[3.432052]
[4.140435]
```
    const int staff_type = istaff.sub_type;
```
Replacement in crawl-ref/source/spl-book.cc at line 1365 [3.397614]
B:BD[3.432273] → [6.136:178]
```
    if (!item_type_known(you.inv[staff]))
```
[3.432273]
[3.432333]
```
    if (!item_type_known(istaff))
```

Replacement in crawl-ref/source/spl-book.cc at line 1367 [3.397614]

B:BD[3.432339] → [3.432339:432400]

        set_ident_flags( you.inv[staff], ISFLAG_KNOW_TYPE );

[3.432339]

[3.432400]

        set_ident_flags( istaff, ISFLAG_KNOW_TYPE );

Deletion in crawl-ref/source/spl-book.cc at line 1370 [3.397614]
B:BD[3.432439] → [3.432439:432484]
```
    spellbook_template( type, spell_list );
```

Replacement in crawl-ref/source/spl-book.cc at line 1371 [3.397614]

B:BD[3.432485] → [3.432485:432679]

    unsigned char num_spells;
    for (num_spells = 0; num_spells < SPELLBOOK_SIZE - 1; num_spells++) 
    {
        if (spell_list[ num_spells + 1 ] == SPELL_NO_SPELL)
            break;
    }

[3.432485]

[3.432679]

    const int num_spells = count_staff_spells(istaff, false);

Replacement in crawl-ref/source/spl-book.cc at line 1397 [3.397614]
B:BD[3.433258] → [3.433258:433332]
```
    if (spell < 'A' || (spell > 'Z' && spell < 'a') || spell > 'z')
    {
```
[3.433258]
[3.433332]
```
    if ( !isalpha(spell) )
```
Deletion in crawl-ref/source/spl-book.cc at line 1399 [3.397614]
B:BD[3.433353] → [3.433353:433359]
```
    }
```

Replacement in crawl-ref/source/spl-book.cc at line 1424 [3.397614]

B:BD[3.433919] → [7.29:104]

    if (you.inv[staff].plus < mana
        || you.experience_level < diff)

[3.433919]

[4.141274]

    if (istaff.plus < mana || you.experience_level < diff)

Replacement in crawl-ref/source/spl-book.cc at line 1429 [3.397614]

B:BD[4.141412] → [4.141412:141484]

                mana, you.inv[staff].plus, diff, you.experience_level);

[4.141412]

[4.141484]

                mana, istaff.plus, diff, you.experience_level);

Replacement in crawl-ref/source/spl-book.cc at line 1444 [3.397614]
B:BD[4.141975] → [7.168:201]
```
    you.inv[staff].plus -= mana;
```
[4.141975]
[4.142179]
```
    istaff.plus -= mana;
```
Deletion in crawl-ref/source/dungeon.cc at line 648 [3.3429798]
B:BD[3.3444545] → [3.3444545:3444592]
```
    FixedVector < int, SPELLBOOK_SIZE > fpass;
```

Cleaned up spellbook handling code, fixes 1699962.

Dependencies

In channels

Change contents

Deletion in crawl-ref/source/spl-book.h at line 20 [3.395672]

Deletion in crawl-ref/source/spl-book.h at line 21 [3.395672]

Deletion in crawl-ref/source/spl-book.h at line 28 [3.395672]

Deletion in crawl-ref/source/spl-book.h at line 43 [3.395672]

Deletion in crawl-ref/source/spl-book.h at line 44 [3.395672]

Insertion in crawl-ref/source/spl-book.h at line 46 [3.395672]

Replacement in crawl-ref/source/spl-book.cc at line 43 [3.397614]

Replacement in crawl-ref/source/spl-book.cc at line 49 [3.397614]

Replacement in crawl-ref/source/spl-book.cc at line 59 [3.397614]

Replacement in crawl-ref/source/spl-book.cc at line 69 [3.397614]

Replacement in crawl-ref/source/spl-book.cc at line 79 [3.397614]

Replacement in crawl-ref/source/spl-book.cc at line 89 [3.397614]

Replacement in crawl-ref/source/spl-book.cc at line 99 [3.397614]

Replacement in crawl-ref/source/spl-book.cc at line 109 [3.397614]

Replacement in crawl-ref/source/spl-book.cc at line 119 [3.397614]

Replacement in crawl-ref/source/spl-book.cc at line 129 [3.397614]

Replacement in crawl-ref/source/spl-book.cc at line 139 [3.397614]

Replacement in crawl-ref/source/spl-book.cc at line 150 [3.397614]

Replacement in crawl-ref/source/spl-book.cc at line 160 [3.397614]

Replacement in crawl-ref/source/spl-book.cc at line 170 [3.397614]

Replacement in crawl-ref/source/spl-book.cc at line 180 [3.397614]

Replacement in crawl-ref/source/spl-book.cc at line 190 [3.397614]

Replacement in crawl-ref/source/spl-book.cc at line 200 [3.397614]

Replacement in crawl-ref/source/spl-book.cc at line 210 [3.397614]

Replacement in crawl-ref/source/spl-book.cc at line 220 [3.397614]

Replacement in crawl-ref/source/spl-book.cc at line 230 [3.397614]

Replacement in crawl-ref/source/spl-book.cc at line 240 [3.397614]

Replacement in crawl-ref/source/spl-book.cc at line 251 [3.397614]

Replacement in crawl-ref/source/spl-book.cc at line 261 [3.397614]

Replacement in crawl-ref/source/spl-book.cc at line 271 [3.397614]

Replacement in crawl-ref/source/spl-book.cc at line 281 [3.397614]

Replacement in crawl-ref/source/spl-book.cc at line 291 [3.397614]

Replacement in crawl-ref/source/spl-book.cc at line 301 [3.397614]

Replacement in crawl-ref/source/spl-book.cc at line 311 [3.397614]

Replacement in crawl-ref/source/spl-book.cc at line 321 [3.397614]

Replacement in crawl-ref/source/spl-book.cc at line 331 [3.397614]

Replacement in crawl-ref/source/spl-book.cc at line 357 [3.397614]

Replacement in crawl-ref/source/spl-book.cc at line 368 [3.397614]

Replacement in crawl-ref/source/spl-book.cc at line 378 [3.397614]

Replacement in crawl-ref/source/spl-book.cc at line 388 [3.397614]

Replacement in crawl-ref/source/spl-book.cc at line 398 [3.397614]

Replacement in crawl-ref/source/spl-book.cc at line 408 [3.397614]

Deletion in crawl-ref/source/spl-book.cc at line 420 [3.397614]

Replacement in crawl-ref/source/spl-book.cc at line 429 [3.397614]

Replacement in crawl-ref/source/spl-book.cc at line 439 [3.397614]

Replacement in crawl-ref/source/spl-book.cc at line 451 [3.397614]

Replacement in crawl-ref/source/spl-book.cc at line 461 [3.397614]

Replacement in crawl-ref/source/spl-book.cc at line 472 [3.397614]

Deletion in crawl-ref/source/spl-book.cc at line 490 [3.397614]

Replacement in crawl-ref/source/spl-book.cc at line 492 [3.397614]

Replacement in crawl-ref/source/spl-book.cc at line 502 [3.397614]

Replacement in crawl-ref/source/spl-book.cc at line 512 [3.397614]

Replacement in crawl-ref/source/spl-book.cc at line 523 [3.397614]

Replacement in crawl-ref/source/spl-book.cc at line 534 [3.397614]

Replacement in crawl-ref/source/spl-book.cc at line 545 [3.397614]

Deletion in crawl-ref/source/spl-book.cc at line 557 [3.397614]

Deletion in crawl-ref/source/spl-book.cc at line 568 [3.397614]

Replacement in crawl-ref/source/spl-book.cc at line 578 [3.397614]

Replacement in crawl-ref/source/spl-book.cc at line 588 [3.397614]

Replacement in crawl-ref/source/spl-book.cc at line 598 [3.397614]

Replacement in crawl-ref/source/spl-book.cc at line 608 [3.397614]

Replacement in crawl-ref/source/spl-book.cc at line 618 [3.397614]

Replacement in crawl-ref/source/spl-book.cc at line 628 [3.397614]

Replacement in crawl-ref/source/spl-book.cc at line 638 [3.397614]

Replacement in crawl-ref/source/spl-book.cc at line 648 [3.397614]

Replacement in crawl-ref/source/spl-book.cc at line 658 [3.397614]

Replacement in crawl-ref/source/spl-book.cc at line 668 [3.397614]

Replacement in crawl-ref/source/spl-book.cc at line 679 [3.397614]

Replacement in crawl-ref/source/spl-book.cc at line 683 [3.397614]

Deletion in crawl-ref/source/spl-book.cc at line 691 [3.397614]

Deletion in crawl-ref/source/spl-book.cc at line 713 [3.397614]

Replacement in crawl-ref/source/spl-book.cc at line 723 [3.397614]

Replacement in crawl-ref/source/spl-book.cc at line 725 [3.397614]

Replacement in crawl-ref/source/spl-book.cc at line 734 [3.397614]

Replacement in crawl-ref/source/spl-book.cc at line 737 [3.397614]

Replacement in crawl-ref/source/spl-book.cc at line 777 [3.397614]