fiddlerwoaroof/crawl - Change OQXMUX5JEITCP2QXJKKOQRLRVTD3LTSDWGI6HTK5GVDIAJ7VKO6AC

'v' now describes decks properly.

There is a small information leak: if you know (from Peek Deck) that the deck contains a card X somewhere, and then you draw card X which happens not to be the seen card X in the internal structure, you can still see from the 'v' output that there is another X card hiding in there.

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

Created by haranp on October 30, 2007

OQXMUX5JEITCP2QXJKKOQRLRVTD3LTSDWGI6HTK5GVDIAJ7VKO6AC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/describe.cc at line 2974 [3.3736416]

[3.3831638]

static bool compare_card_names(card_type a, card_type b)
{
    return std::string(card_name(a)) < std::string(card_name(b));
}

Replacement in crawl-ref/source/describe.cc at line 3193 [3.3736416]
B:BD[3.3839154] → [4.965:1009]
```
    if ( is_deck(item) && item.plus2 != 0 )
```
[3.3839154]
[4.1009]
```
    if ( is_deck(item) )
```

Replacement in crawl-ref/source/describe.cc at line 3195 [3.3736416]

B:BD[4.1015] → [4.1015:1188]

        description += "$Next card(s): ";
        description += card_name(static_cast<card_type>(item.plus2 - 1));
        long spec = item.special;
        while ( spec )

[4.1015]

[4.1188]

        const int num_cards = cards_in_deck(item);
        if ( top_card_is_known(item) )
        {
            description += "Next card(s): ";
            for ( int i = 0; i < num_cards; ++i )
            {
                unsigned char flags;
                const card_type card = get_card_and_flags(item, -i-1, flags);
                if ( flags & CFLAG_MARKED )
                {
                    if ( i != 0 )
                        description += ", ";
                    description += card_name(card);
                }
                else
                    break;
            }
        }
        std::vector<card_type> seen_cards;
        for ( int i = 0; i < num_cards; ++i )
        {
            unsigned char flags;
            const card_type card = get_card_and_flags(item, -i-1, flags);
            // This *might* leak a bit of information...oh well.
            if ( (flags & CFLAG_SEEN) && !(flags & CFLAG_MARKED) )
                seen_cards.push_back(card);
        }
        if ( !seen_cards.empty() )

Replacement in crawl-ref/source/describe.cc at line 3225 [3.3736416]

B:BD[4.1198] → [4.1198:1334]

            description += ", ";
            description += card_name(static_cast<card_type>((spec & 0xFF)-1));
            spec >>= 8;

[4.1198]

[4.1334]

            std::sort(seen_cards.begin(), seen_cards.end(),
                      compare_card_names);
            description += "$Seen cards: ";
            for ( unsigned int i = 0; i < seen_cards.size(); ++i )
            {
                if ( i != 0 )
                    description += ", ";
                description += card_name(seen_cards[i]);
            }

Insertion in crawl-ref/source/decks.h at line 139 [3.3986924]

[2.40905]

[5.100742]


int cards_in_deck(const item_def &deck);
card_type get_card_and_flags(const item_def& deck, int idx,
                             unsigned char& _flags);

Replacement in crawl-ref/source/decks.cc at line 57 [3.3987460]

B:BD[2.41189] → [2.41189:41256]

// card), deck.props.["card_flags"] holds the flags for each card,

[2.41189]

[2.41256]

// card), deck.props["card_flags"] holds the flags for each card,

Replacement in crawl-ref/source/decks.cc at line 144 [3.3987460]
B:BD[2.41800] → [2.41800:41857]
```
static unsigned long cards_in_deck(const item_def &deck)
```
[2.41800]
[2.41857]
```
int cards_in_deck(const item_def &deck)
```

Replacement in crawl-ref/source/decks.cc at line 170 [3.3987460]

B:BD[2.42633] → [2.42633:42737]

    for (unsigned long i = 0, size = cards.size(); i < size; i++)
        pos.push_back(random2(size));

[2.42633]

[2.42737]

    for (unsigned long i = 0; i < cards.size(); i++)
        pos.push_back(random2(cards.size()));

Replacement in crawl-ref/source/decks.cc at line 173 [3.3987460]

B:BD[2.42738] → [2.42738:42802]

    for (unsigned long i = 0, size = pos.size(); i < size; i++)

[2.42738]

[2.42802]

    for (unsigned long i = 0; i < pos.size(); i++)

Replacement in crawl-ref/source/decks.cc at line 180 [3.3987460]

B:BD[2.42905] → [2.42905:43031]

static card_type get_card_and_flags(const item_def& deck, int idx,
                                    unsigned char& _flags)

[2.42905]

[2.43031]

card_type get_card_and_flags(const item_def& deck, int idx,
                             unsigned char& _flags)

Replacement in crawl-ref/source/decks.cc at line 187 [3.3987460]

B:BD[2.43209] → [2.43209:43266]

    if (idx == -1)
        idx = (int) cards.size() - 1;

[2.43209]

[6.12031]

    // negative idx means read from the end
    if (idx < 0)
        idx += static_cast<int>(cards.size());

Replacement in crawl-ref/source/decks.cc at line 2355 [3.3987460]
B:BD[2.63372] → [2.63372:63434]
```
    ASSERT(cards_in_deck(item) == (unsigned long) item.plus);
```
[2.63372]
[2.63434]
```
    ASSERT(cards_in_deck(item) == item.plus);
```