fiddlerwoaroof/crawl - Change KZIHM6RUX43HHKXG6HGJHVEEYUPVVNBFIWMT4SKPD2GAH5ZMA3KAC

Fix 1905715: Print "nothing appears to happen" when zapping /digging

         without effect, same as for enchantment wands.

Fix 1905740: Only list actual spellbooks for memorise prompt. Also: s/memorize/memorise

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

Created by j-p-e-g on March 3, 2008

KZIHM6RUX43HHKXG6HGJHVEEYUPVVNBFIWMT4SKPD2GAH5ZMA3KAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/tutorial.cc at line 1964 [6.5936]

B:BD[5.13733] → [4.12906:12986]

                         ostr << "A spellbook! You could <w>M</w>emorize some "

[5.13733]

[4.12986]

                         ostr << "A spellbook! You could <w>M</w>emorise some "

Replacement in crawl-ref/source/tutorial.cc at line 1977 [6.5936]

B:BD[5.14372] → [4.13118:13198]

                         ostr << "A spellbook! You could <w>M</w>emorize some "

[5.14372]

[4.13198]

                         ostr << "A spellbook! You could <w>M</w>emorise some "

Replacement in crawl-ref/source/tiles.h at line 85 [7.7013]
∅:D[2.412] → [7.9711:9740]
B:BD[7.9711] → [7.9711:9740]
```
// display memorized dungeon
```
[2.412]
[7.9740]
```
// display memorised dungeon
```

Replacement in crawl-ref/source/spl-cast.cc at line 833 [9.293070]

B:BD[8.4845] → [8.4845:4914]

    // Normally undead can't memorize these spells, so this check is

[8.4845]

[8.4914]

    // Normally undead can't memorise these spells, so this check is

Replacement in crawl-ref/source/spl-book.cc at line 978 [9.397614]
∅:D[10.328] → [11.137919:137962]
B:BD[11.137919] → [11.137919:137962]
```
                              OBJ_BOOKS );
```
[10.328]
[9.421695]
```
                              OSEL_MEMORISE );
```

Replacement in crawl-ref/source/spl-book.cc at line 1001 [9.397614]

B:BD[9.422232] → [12.7929:7996]

// Returns false if the player cannot read/memorize from the book,

[9.422232]

[9.422300]

// Returns false if the player cannot read/memorise from the book,

Replacement in crawl-ref/source/monstuff.cc at line 5190 [9.1396662]

B:BD[13.3278] → [13.3278:3338]

    //   (or have memorized part of the dungeon layout ;) )

[13.3278]

[13.3338]

    //   (or have memorised part of the dungeon layout ;) )

Replacement in crawl-ref/source/monspeak.cc at line 51 [9.1558496]
∅:D[14.955] → [15.7086:7128]
B:BD[15.7086] → [15.7086:7128]
```
    const int   size   = prefixes.size();
```
[14.955]
[15.7128]
```
    const int size = prefixes.size();
```

Replacement in crawl-ref/source/libgui.cc at line 1378 [7.5793336]

B:BD[16.6086] → [17.6539:6595]

                                desc += "Memorize (M)";

[16.6086]

[16.6141]

                                desc += "Memorise (M)";

Replacement in crawl-ref/source/invent.h at line 25 [9.2919073]

B:BD[18.91336] → [18.91336:91427]

    OSEL_ANY     = -1,
    OSEL_WIELD   = -2,
    OSEL_UNIDENT = -3,
    OSEL_EQUIP   = -4

[18.91336]

[18.91427]

    OSEL_ANY      = -1,
    OSEL_WIELD    = -2,
    OSEL_UNIDENT  = -3,
    OSEL_EQUIP    = -4,
    OSEL_MEMORISE = -5

Insertion in crawl-ref/source/invent.cc at line 757 [9.2920632]

[19.379641]

    case OSEL_MEMORISE:
        return (itype == OBJ_BOOKS && i.sub_type != BOOK_MANUAL
                && (i.sub_type != BOOK_DESTRUCTION || !item_type_known(i)));

Replacement in crawl-ref/source/beam.cc at line 1572 [9.4128068]
∅:D[3.2831] → [11.1230624:1230687]
B:BD[9.4179157] → [11.1230624:1230687]
```
    if (pbolt.name[0] == '0' && pbolt.flavour != BEAM_DIGGING)
```
[3.2831]
[9.4179225]
```
    if (pbolt.name[0] == '0')
```