fiddlerwoaroof/crawl - Change THE3KMFFWY4ZUFE3Z6RVTGPSPENYR7ULZDXPQYB3FXWPJOJ5P7WQC

[1626830] Fixed non-stacking potions.

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

Created by dshaligram on January 4, 2007

THE3KMFFWY4ZUFE3Z6RVTGPSPENYR7ULZDXPQYB3FXWPJOJ5P7WQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/items.cc at line 1309 [4.2584728]

[4.2612142]

}
int ident_flags(const item_def &item)
{
    int flags = item.flags & full_ident_mask(item);
    if (!(flags & ISFLAG_KNOW_TYPE) && item_type_known(item))
        flags |= ISFLAG_KNOW_TYPE;
    return (flags);

Replacement in crawl-ref/source/items.cc at line 1347 [4.2584728]

B:BD[3.154] → [3.154:255]

    if ( (item1.flags & full_ident_mask(item1)) !=
         (item2.flags & full_ident_mask(item2)) )

[3.154]

[3.255]

    if (ident_flags(item1) != ident_flags(item2))

Deletion in crawl-ref/source/items.cc at line 1355 [4.2584728]
∅:D[3.425] → [4.2613888:2613889]
B:BD[4.2613888] → [4.2613888:2613889]

Replacement in crawl-ref/source/items.cc at line 1359 [4.2584728]

B:BD[3.690] → [3.690:788]

        (!item_ident(item1, ISFLAG_KNOW_TYPE) ||
         !item_ident(item2, ISFLAG_KNOW_TYPE )))

[3.690]

[3.788]

        (!item_type_known(item1) || !item_type_known(item2)))
    {

Insertion in crawl-ref/source/items.cc at line 1362 [4.2584728]
[3.810]
[3.810]
```
    }
```
Deletion in crawl-ref/source/itemname.cc at line 68 [4.2667494]
∅:D[2.537] → [4.2668556:2668557]
∅:D[5.709902] → [4.2668556:2668557]
B:BD[4.2668556] → [4.2668556:2668557]

Insertion in crawl-ref/source/itemname.cc at line 76 [4.2667494]

[4.2669471]

[6.359899]

item_type_id_type objtype_to_idtype(int base_type)
{
    switch (base_type)
    {
    case OBJ_WANDS:     return (IDTYPE_WANDS);
    case OBJ_SCROLLS:   return (IDTYPE_SCROLLS);
    case OBJ_JEWELLERY: return (IDTYPE_JEWELLERY);
    case OBJ_POTIONS:   return (IDTYPE_POTIONS);
    default:            return (NUM_IDTYPE);
    }
}

Replacement in crawl-ref/source/itemname.cc at line 90 [4.2667494]

B:BD[6.359946] → [6.359946:360110]

    return item_ident(item, ISFLAG_KNOW_TYPE)
        || (item.base_type == OBJ_JEWELLERY
                && id[IDTYPE_JEWELLERY][item.sub_type] == ID_KNOWN_TYPE);

[6.359946]

[4.2672701]

    if (item_ident(item, ISFLAG_KNOW_TYPE))
        return (true);
    const item_type_id_type idt = objtype_to_idtype(item.base_type);
    return (idt != NUM_IDTYPE? id[idt][item.sub_type] == ID_KNOWN_TYPE : false);