fiddlerwoaroof/crawl - Change 7KVPF74ACO6Q5FXS2YBBJTJT4Y4YN2M3ZNIPXFI3QSQNGNTHD7AAC

Fixed spell name cache asserting on invalid spells.

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

Created by dshaligram on April 1, 2008

7KVPF74ACO6Q5FXS2YBBJTJT4Y4YN2M3ZNIPXFI3QSQNGNTHD7AAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/spl-util.h at line 62 [5.242902]
[5.243482]
[5.243482]
Insertion in crawl-ref/source/spl-util.h at line 64 [5.242902]
[5.243483]
[5.243483]
```
bool is_valid_spell(spell_type spell);
```

Replacement in crawl-ref/source/spl-util.cc at line 55 [5.245665]

B:BD[5.246792] → [6.205:262]

static struct spell_desc *seekspell(spell_type spellid);

[5.246792]

[2.467]

static struct spell_desc *_seekspell(spell_type spellid);

Deletion in crawl-ref/source/spl-util.cc at line 86 [5.245665]

B:BD[3.1296] → [3.1296:1389]

        const char *sptitle = spell_title(type);
        if (!sptitle)
            continue;

Insertion in crawl-ref/source/spl-util.cc at line 87 [5.245665]

[3.1390]

        if (!is_valid_spell(type))
            continue;
        
        const char *sptitle = spell_title(type);
        ASSERT(sptitle);

Replacement in crawl-ref/source/spl-util.cc at line 225 [5.245665]
B:BD[7.2016] → [7.2016:2064]
```
    return (seekspell(spell)->ms_needs_tracer);
```
[7.2016]
[7.2064]
```
    return (_seekspell(spell)->ms_needs_tracer);
```
Replacement in crawl-ref/source/spl-util.cc at line 230 [5.245665]
B:BD[7.2108] → [7.2108:2152]
```
    return (!seekspell(spell)->ms_utility);
```
[7.2108]
[7.2152]
```
    return (!_seekspell(spell)->ms_utility);
```
Replacement in crawl-ref/source/spl-util.cc at line 237 [5.245665]
B:BD[5.249700] → [5.249700:249744]
```
    return (seekspell(which_spell)->level);
```
[5.249700]
[5.249744]
```
    return (_seekspell(which_spell)->level);
```
Replacement in crawl-ref/source/spl-util.cc at line 244 [5.245665]
B:BD[5.249935] → [5.249935:249979]
```
    return (seekspell(which_spell)->level);
```
[5.249935]
[5.249979]
```
    return (_seekspell(which_spell)->level);
```
Replacement in crawl-ref/source/spl-util.cc at line 267 [5.245665]
B:BD[8.118648] → [8.118648:118692]
```
    return (seekspell(which_spell)->flags);
```
[8.118648]
[9.230]
```
    return (_seekspell(which_spell)->flags);
```

Replacement in crawl-ref/source/spl-util.cc at line 272 [5.245665]

B:BD[9.290] → [9.290:342]

    return (seekspell(which_spell)->target_prompt);

[9.290]

[5.250395]

    return (_seekspell(which_spell)->target_prompt);

Replacement in crawl-ref/source/spl-util.cc at line 277 [5.245665]

B:BD[5.250469] → [5.250469:250538]

    return (seekspell(which_spell)->disciplines & which_discipline);

[5.250469]

[5.250538]

    return (_seekspell(which_spell)->disciplines & which_discipline);

Replacement in crawl-ref/source/spl-util.cc at line 283 [5.245665]
B:BD[5.250618] → [5.250618:250662]
```
    return (seekspell(spell)->disciplines);
```
[5.250618]
[5.250662]
```
    return (_seekspell(spell)->disciplines);
```
Replacement in crawl-ref/source/spl-util.cc at line 302 [5.245665]
B:BD[5.251463] → [4.158:196]
```
    return (seekspell(spell)->title);
```
[5.251463]
[5.251501]
```
    return (_seekspell(spell)->title);
```
Replacement in crawl-ref/source/spl-util.cc at line 881 [5.245665]
B:BD[7.2567] → [10.390:437]
```
static spell_desc *seekspell(spell_type spell)
```
[7.2567]
[5.267775]
```
static spell_desc *_seekspell(spell_type spell)
```

Insertion in crawl-ref/source/spl-util.cc at line 888 [5.245665]

[5.267828]

[2.3533]

bool is_valid_spell(spell_type spell)
{
    return (spell < NUM_SPELLS && spell_list[spell] != -1);
}

Replacement in crawl-ref/source/spl-util.cc at line 909 [5.245665]
B:BD[6.675] → [6.675:715]
```
    return seekspell(spell)->power_cap;
```
[6.675]
[5.268112]
```
    return _seekspell(spell)->power_cap;
```

Fixed spell name cache asserting on invalid spells.

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/spl-util.h at line 62 [5.242902]

Insertion in crawl-ref/source/spl-util.h at line 64 [5.242902]

Replacement in crawl-ref/source/spl-util.cc at line 55 [5.245665]

Deletion in crawl-ref/source/spl-util.cc at line 86 [5.245665]

Insertion in crawl-ref/source/spl-util.cc at line 87 [5.245665]

Replacement in crawl-ref/source/spl-util.cc at line 225 [5.245665]

Replacement in crawl-ref/source/spl-util.cc at line 230 [5.245665]

Replacement in crawl-ref/source/spl-util.cc at line 237 [5.245665]

Replacement in crawl-ref/source/spl-util.cc at line 244 [5.245665]

Replacement in crawl-ref/source/spl-util.cc at line 267 [5.245665]

Replacement in crawl-ref/source/spl-util.cc at line 272 [5.245665]

Replacement in crawl-ref/source/spl-util.cc at line 277 [5.245665]

Replacement in crawl-ref/source/spl-util.cc at line 283 [5.245665]

Replacement in crawl-ref/source/spl-util.cc at line 302 [5.245665]

Replacement in crawl-ref/source/spl-util.cc at line 881 [5.245665]

Insertion in crawl-ref/source/spl-util.cc at line 888 [5.245665]

Replacement in crawl-ref/source/spl-util.cc at line 909 [5.245665]