fiddlerwoaroof/crawl - Change 3Z46NUKRWJ4YMLS3C5GXSN3WKBZPCU6CBBG2DOJAXOWY2WIIRFDQC

Fix Triple Draw not updating num_marked on a deck. Fixes [2516231].

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

Created by haranp on February 4, 2009

3Z46NUKRWJ4YMLS3C5GXSN3WKBZPCU6CBBG2DOJAXOWY2WIIRFDQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/menu.cc at line 1563 [4.261322]
B:BD[3.492] → [3.492:527]
```
    linebreak_string2(r, maxcol );
```
[3.492]
[3.527]
```
    linebreak_string2(r, maxcol);
```
Replacement in crawl-ref/source/decks.cc at line 1088 [6.3987460]
B:BD[5.58231] → [5.58231:58292]
```
        flags.push_back(_flags | CFLAG_SEEN | CFLAG_MARKED);
```
[5.58231]
[5.58292]
```
        flags.push_back(_flags);
```

Insertion in crawl-ref/source/decks.cc at line 1112 [6.3987460]

[5.58405]

[7.42246]


    // Don't forget to update the number of marked ones, too.
    // But don't reduce the number of non-brownie draws.
    char num_marked_left = deck.props["num_marked"].get_byte();

Insertion in crawl-ref/source/decks.cc at line 1117 [6.3987460]
[7.42288]
[2.3145]
```
    {
```

Insertion in crawl-ref/source/decks.cc at line 1119 [6.3987460]

[2.3198]

[5.58405]

        if (flags[i] & CFLAG_MARKED)
        {
            ASSERT(num_marked_left > 0);
            --num_marked_left;
        }
    }
    deck.props["num_marked"] = num_marked_left;

Replacement in crawl-ref/source/decks.cc at line 1142 [6.3987460]

B:BD[5.58694] → [5.58694:58760]

    card_effect(draws[selected], rarity, flags[selected], false);

[5.58694]

[5.58760]

    card_effect(draws[selected], rarity,
                flags[selected] | CFLAG_SEEN | CFLAG_MARKED, false);