fiddlerwoaroof/crawl - Change 75JWS3AAH2VYNUJO3HM54T3XUBQQX75RI5NARFF6AYTABOPXUPHAC

Fix starting books being unidentified at game start.

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

Created by j-p-e-g on January 31, 2009

75JWS3AAH2VYNUJO3HM54T3XUBQQX75RI5NARFF6AYTABOPXUPHAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spl-book.cc at line 1160 [6.397614]

B:BD[5.317] → [5.317:447]

    if ( booktype == BOOK_MINOR_MAGIC_I
         || booktype == BOOK_MINOR_MAGIC_II
         || booktype == BOOK_MINOR_MAGIC_III)

[5.317]

[5.447]

    if (booktype == BOOK_MINOR_MAGIC_I
        || booktype == BOOK_MINOR_MAGIC_II
        || booktype == BOOK_MINOR_MAGIC_III)

Replacement in crawl-ref/source/spl-book.cc at line 1164 [6.397614]

B:BD[5.453] → [5.453:552]

        you.had_book[BOOK_MINOR_MAGIC_I] = true;
        you.had_book[BOOK_MINOR_MAGIC_II] = true;

[5.453]

[5.552]

        you.had_book[BOOK_MINOR_MAGIC_I]   = true;
        you.had_book[BOOK_MINOR_MAGIC_II]  = true;

Replacement in crawl-ref/source/spl-book.cc at line 1171 [6.397614]

B:BD[5.710] → [5.710:760]

        you.had_book[BOOK_CONJURATIONS_I] = true;

[5.710]

[5.760]

        you.had_book[BOOK_CONJURATIONS_I]  = true;

Replacement in crawl-ref/source/newgame.cc at line 1314 [6.1132300]

B:BD[7.4483] → [8.2867:2924]

            set_ident_type( you.inv[i], ID_KNOWN_TYPE );

[7.4483]

[9.10362]

            set_ident_type(you.inv[i], ID_KNOWN_TYPE);
            set_ident_flags(you.inv[i], ISFLAG_IDENT_MASK);

Replacement in crawl-ref/source/newgame.cc at line 2066 [6.1132300]

B:BD[10.6209] → [10.6209:6281]

static bool _choose_book( item_def& book, int firstbook, int numbooks )

[11.16083]

[10.6281]

static bool _choose_book( int slot, int firstbook, int numbooks )

Deletion in crawl-ref/source/newgame.cc at line 2068 [6.1132300]
B:BD[10.6283] → [10.6283:6302]
```
    int keyin = 0;
```
Insertion in crawl-ref/source/newgame.cc at line 2069 [6.1132300]
[10.6316]
[10.6316]
```
    item_def &book(you.inv[slot]);
```
Insertion in crawl-ref/source/newgame.cc at line 2072 [6.1132300]
[10.6348]
[10.6348]
```
    book.sub_type  = firstbook;
```
Insertion in crawl-ref/source/newgame.cc at line 2075 [6.1132300]
[10.6396]
[10.6396]
```
    book.plus2     = 0;
```
Insertion in crawl-ref/source/newgame.cc at line 2080 [6.1132300]
[12.3859]
[10.6467]
```
    ASSERT(numbooks >= 1 && numbooks <= 3);
```
Insertion in crawl-ref/source/newgame.cc at line 2108 [6.1132300]
[13.384406]
[14.2562]
```
    int keyin = 0;
```

Replacement in crawl-ref/source/newgame.cc at line 2126 [6.1132300]

∅:D[11.16884] → [15.4653:4729]

B:BD[16.74572] → [15.4653:4729]

            cprintf("%c - %s" EOL, 'a' + i, book.name(DESC_PLAIN).c_str());

[11.16884]

[16.74670]

            cprintf("%c - %s" EOL, 'a' + i,
                    book.name(DESC_PLAIN, false, true).c_str());

Replacement in crawl-ref/source/newgame.cc at line 2173 [6.1132300]

B:BD[12.4543] → [12.4543:4663]

                              + _start_to_book(firstbook, Options.prev_book)
                              - firstbook;

[12.4543]

[12.4663]

                                + _start_to_book(firstbook, Options.prev_book)
                                - firstbook;

Replacement in crawl-ref/source/newgame.cc at line 2180 [6.1132300]

B:BD[17.2805] → [17.2805:2869]

                return _choose_book(book, firstbook, numbooks);

[17.2805]

[18.8792]

                return _choose_book(slot, firstbook, numbooks);

Replacement in crawl-ref/source/newgame.cc at line 4397 [6.1132300]

B:BD[19.2966] → [19.2966:3038]

                        you.inv[2].name(DESC_QUALNAME, false).c_str());

[19.2966]

[4.4710]

                        you.inv[2].name(DESC_QUALNAME, false, true).c_str());

Replacement in crawl-ref/source/newgame.cc at line 5257 [6.1132300]

B:BD[20.4339] → [20.4339:4404]

        if (!_choose_book( you.inv[2], BOOK_CONJURATIONS_I, 2 ))

[20.4339]

[20.4404]

        if (!_choose_book(2, BOOK_CONJURATIONS_I, 2 ))

Replacement in crawl-ref/source/newgame.cc at line 5298 [6.1132300]

B:BD[20.4743] → [2.2805:2869]

        if (!_choose_book( you.inv[2], BOOK_MINOR_MAGIC_I, 3 ))

[20.4743]

[20.4807]

        if (!_choose_book(2, BOOK_MINOR_MAGIC_I, 3 ))

Replacement in crawl-ref/source/newgame.cc at line 5328 [6.1132300]

B:BD[6.1240105] → [2.2978:3043]

        if (!_choose_book( you.inv[1], BOOK_CONJURATIONS_I, 2 ))

[6.1240105]

[20.5789]

        if (!_choose_book(1, BOOK_CONJURATIONS_I, 2 ))

Insertion in crawl-ref/source/itemname.cc at line 87 [6.2667494]
[3.2728]
[3.2728]
```
    {
```

Replacement in crawl-ref/source/itemname.cc at line 89 [6.2667494]

B:BD[3.2791] → [3.2791:2837]

                      | ISFLAG_COSMETIC_MASK;

[3.2791]

[3.2837]

                        | ISFLAG_COSMETIC_MASK;
    }

Replacement in crawl-ref/source/enum.h at line 323 [6.3287960]
B:BD[21.11799] → [21.11799:11821]
```
    BOOK_CARD_EFFECT,
```
[21.11799]
[21.11821]
```
    BOOK_CARD_EFFECT,    // not implemented
```

Fix starting books being unidentified at game start.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/spl-book.cc at line 1160 [6.397614]

Replacement in crawl-ref/source/spl-book.cc at line 1164 [6.397614]

Replacement in crawl-ref/source/spl-book.cc at line 1171 [6.397614]

Replacement in crawl-ref/source/newgame.cc at line 1314 [6.1132300]

Replacement in crawl-ref/source/newgame.cc at line 2066 [6.1132300]

Deletion in crawl-ref/source/newgame.cc at line 2068 [6.1132300]

Insertion in crawl-ref/source/newgame.cc at line 2069 [6.1132300]

Insertion in crawl-ref/source/newgame.cc at line 2072 [6.1132300]

Insertion in crawl-ref/source/newgame.cc at line 2075 [6.1132300]

Insertion in crawl-ref/source/newgame.cc at line 2080 [6.1132300]

Insertion in crawl-ref/source/newgame.cc at line 2108 [6.1132300]