fiddlerwoaroof/crawl - Change KEWUUIWZCM2VE6WZX4BC4DXGL7LBAWGLUPCPA4KCBCUL5ZQLECBAC

Fix bug #2510110: blood potions coagulating while in a monster's inventory

was causing crashes.

Get rid of drop_blood_potions_stack() and pick_up_blood_potions_stack(), replace with the more general merge_blood_potion_stacks() and merge_item_stacks().

When creating blood potions via debug command you can now specify how many turns away from coagulating/rotting it should be.

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

Created by zelgadis on January 16, 2009

KEWUUIWZCM2VE6WZX4BC4DXGL7LBAWGLUPCPA4KCBCUL5ZQLECBAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/mon-util.cc at line 4324 [8.1699344]

B:BD[7.8477] → [7.8477:8538]

        if (items_stack(item, mitm[inv[slot]], force_merge))

[7.8477]

[7.8538]

        item_def &dest(mitm[inv[slot]]);
        if (items_stack(item, dest, force_merge))

Insertion in crawl-ref/source/mon-util.cc at line 4334 [8.1699344]
[7.8652]
[7.8652]
```
            merge_item_stacks(item, dest);
```

Replacement in crawl-ref/source/misc.h at line 36 [8.1928926]

B:BD[9.3242] → [10.36405:36529]

∅:D[10.36529] → [9.3372:3436]

B:BD[9.3372] → [9.3372:3436]

void drop_blood_potions_stack( item_def &stack, int quant,
                               const coord_def& p = you.pos() );
void pick_up_blood_potions_stack( item_def &stack, int quant );

[9.3242]

[11.5199]

void merge_blood_potion_stacks(item_def &source, item_def &dest, int quant);

Replacement in crawl-ref/source/misc.cc at line 318 [8.1933596]

B:BD[12.12862] → [13.3353:3431]

B:BD[13.3431] → [14.57732:57864]

    // Now that coagulating is necessary, check square for !coagulated blood.
    ASSERT(blood.pos.x >= 0 && blood.pos.y >= 0);
    for (int o = igrd[blood.pos.x][blood.pos.y]; o != NON_ITEM; o = mitm[o].link)

[12.12862]

[12.13001]

    if (!held_by_monster(blood))

Replacement in crawl-ref/source/misc.cc at line 320 [8.1933596]

B:BD[12.13007] → [12.13007:13109]

        if (mitm[o].base_type == OBJ_POTIONS
            && mitm[o].sub_type == POT_BLOOD_COAGULATED)

[12.13007]

[12.13109]

        // Now that coagulating is necessary, check square for
        // !coagulated blood.
        ASSERT(blood.pos.x >= 0 && blood.pos.y >= 0);
        for (int o = igrd[blood.pos.x][blood.pos.y]; o != NON_ITEM;
             o = mitm[o].link)

Replacement in crawl-ref/source/misc.cc at line 326 [8.1933596]

B:BD[12.13119] → [13.3432:3474]

∅:D[15.3426] → [12.13119:13171]

∅:D[13.3474] → [12.13119:13171]

B:BD[12.13119] → [12.13119:13171]

B:BD[12.13171] → [9.5493:5602]

            // Merge with existing stack.
            CrawlHashTable &props2 = mitm[o].props;
            if (!props2.exists("timer"))
                init_stack_blood_potions(mitm[o], mitm[o].special);

[12.13119]

[9.5602]

            if (mitm[o].base_type == OBJ_POTIONS
                && mitm[o].sub_type == POT_BLOOD_COAGULATED)
            {
                // Merge with existing stack.
                CrawlHashTable &props2 = mitm[o].props;
                if (!props2.exists("timer"))
                    init_stack_blood_potions(mitm[o], mitm[o].special);

Replacement in crawl-ref/source/misc.cc at line 334 [8.1933596]

∅:D[9.5603] → [12.13171:13215]

B:BD[12.13171] → [12.13171:13215]

B:BD[12.13215] → [9.5604:5668]

∅:D[9.5668] → [12.13266:13321]

B:BD[12.13266] → [12.13266:13321]

            ASSERT(props2.exists("timer"));
            CrawlVector &timer2 = props2["timer"].get_vector();
            ASSERT(timer2.size() == mitm[o].quantity);

[9.5603]

[12.13321]

                ASSERT(props2.exists("timer"));
                CrawlVector &timer2 = props2["timer"].get_vector();
                ASSERT(timer2.size() == mitm[o].quantity);

Replacement in crawl-ref/source/misc.cc at line 338 [8.1933596]

B:BD[12.13322] → [13.3475:3517]

∅:D[13.3517] → [12.13363:13570]

B:BD[12.13363] → [12.13363:13570]

            // Update timer -> push(pop).
            long val;
            while (!age_timer.empty())
            {
                val = age_timer[age_timer.size() - 1];
                age_timer.pop_back();
                timer2.push_back(val);

[12.13322]

[12.13570]

                // Update timer -> push(pop).
                long val;
                while (!age_timer.empty())
                {
                    val = age_timer[age_timer.size() - 1];
                    age_timer.pop_back();
                    timer2.push_back(val);
                }
                _long_sort(timer2);
                inc_mitm_item_quantity(o, coag_count);
                ASSERT(timer2.size() == mitm[o].quantity);
                dec_mitm_item_quantity(obj, rot_count + coag_count);
                return;

Deletion in crawl-ref/source/misc.cc at line 352 [8.1933596]

B:BD[12.13584] → [12.13584:13616]

B:BD[12.13616] → [15.3427:3533]

B:BD[15.3533] → [9.5669:5734]

∅:D[9.5734] → [12.13688:13708]

B:BD[12.13688] → [12.13688:13708]

            _long_sort(timer2);
            inc_mitm_item_quantity(o, coag_count);
            ASSERT(timer2.size() == mitm[o].quantity);
            dec_mitm_item_quantity(obj, rot_count + coag_count);
            return;

Replacement in crawl-ref/source/misc.cc at line 354 [8.1933596]

B:BD[12.13750] → [2.2580:2622]

    // If we got here, nothing was found!

[12.13750]

    // If we got here, nothing was found! (Or it's in a monster's
    // inventory).

Deletion in crawl-ref/source/misc.cc at line 407 [8.1933596]
B:BD[9.6604] → [9.6604:6605]
Deletion in crawl-ref/source/misc.cc at line 409 [8.1933596]
B:BD[9.6682] → [5.4295:4333]
```
    move_item_to_grid(&o, blood.pos);
```

Insertion in crawl-ref/source/misc.cc at line 410 [8.1933596]

[9.6730]

    if (held_by_monster(blood))
        move_item_to_grid(&o, holding_monster(blood)->pos());
    else
        move_item_to_grid(&o, blood.pos);

Replacement in crawl-ref/source/misc.cc at line 819 [8.1933596]

B:BD[9.16909] → [9.16909:16943]

B:BD[9.16943] → [13.4929:4996]

B:BD[13.4996] → [10.36853:36931]

// Called from copy_item_to_grid.
// NOTE: Quantities are set afterwards, so don't ASSERT for those.
void drop_blood_potions_stack(item_def &stack, int quant, const coord_def& p)

[9.16909]

[9.17076]

void merge_blood_potion_stacks(item_def &source, item_def &dest, int quant)

Replacement in crawl-ref/source/misc.cc at line 821 [8.1933596]
B:BD[9.17078] → [9.17078:17109]
```
    if (!is_valid_item(stack))
```
[9.17078]
[12.15632]
```
    if (!is_valid_item(source) || !is_valid_item(dest))
```

Replacement in crawl-ref/source/misc.cc at line 824 [8.1933596]

B:BD[11.7000] → [9.17110:17160]

B:BD[9.17160] → [16.2979:3015]

    ASSERT(quant > 0 && quant <= stack.quantity);
    ASSERT(is_blood_potion(stack));

[11.7000]

[12.15824]

    ASSERT(quant > 0 && quant <= source.quantity);
    ASSERT(is_blood_potion(source) && is_blood_potion(dest));

Replacement in crawl-ref/source/misc.cc at line 827 [8.1933596]
B:BD[12.15825] → [12.15825:15866]
```
    CrawlHashTable &props = stack.props;
```
[12.15825]
[9.17161]
```
    CrawlHashTable &props = source.props;
```

Replacement in crawl-ref/source/misc.cc at line 829 [8.1933596]

B:BD[9.17193] → [9.17193:17249]

        init_stack_blood_potions(stack, stack.special);

[9.17193]

[12.15866]

        init_stack_blood_potions(source, source.special);

Insertion in crawl-ref/source/misc.cc at line 833 [8.1933596]

[12.15970]


    CrawlHashTable &props2 = dest.props;
    if (!props2.exists("timer"))
        init_stack_blood_potions(dest, dest.special);
    ASSERT(props2.exists("timer"));
    CrawlVector &timer2 = props2["timer"].get_vector();

Replacement in crawl-ref/source/misc.cc at line 840 [8.1933596]
B:BD[12.15971] → [13.4997:5074]
B:BD[13.5074] → [10.36932:36960]
∅:D[9.17329] → [12.16087:16113]
∅:D[10.36960] → [12.16087:16113]
B:BD[12.16087] → [12.16087:16113]
```
    // First check whether we can merge with an existing stack on the floor.
    int o = igrd[p.x][p.y];
    while (o != NON_ITEM)
```
[12.15971]
[12.16113]
```
    // Update timer -> push(pop).
    for (int i = 0; i < quant; i++)
```

Replacement in crawl-ref/source/misc.cc at line 843 [8.1933596]

B:BD[12.16119] → [12.16119:16277]

B:BD[12.16277] → [9.17330:17439]

∅:D[9.17439] → [12.16277:16321]

B:BD[12.16277] → [12.16277:16321]

B:BD[12.16321] → [9.17440:17504]

∅:D[9.17504] → [12.16372:16373]

B:BD[12.16372] → [12.16372:16373]

B:BD[12.16373] → [13.5075:5117]

∅:D[13.5117] → [12.16414:16458]

B:BD[12.16414] → [12.16414:16458]

B:BD[12.16458] → [9.17505:17637]

∅:D[9.17637] → [12.16510:16511]

B:BD[12.16510] → [12.16510:16511]

B:BD[12.16511] → [13.5118:5148]

∅:D[13.5148] → [12.16595:16627]

B:BD[12.16595] → [12.16595:16627]

B:BD[12.16739] → [12.16739:17001]

        if (mitm[o].base_type == OBJ_POTIONS
            && mitm[o].sub_type == stack.sub_type)
        {
            CrawlHashTable &props2 = mitm[o].props;
            if (!props2.exists("timer"))
                init_stack_blood_potions(mitm[o], mitm[o].special);
            ASSERT(props2.exists("timer"));
            CrawlVector &timer2 = props2["timer"].get_vector();
            // Update timer -> push(pop).
            for (int i = 0; i < quant; i++)
            {
                timer2.push_back(timer[timer.size() - 1].get_long());
                timer.pop_back();
            }
            // Re-sort timer.
            _long_sort(timer2);
            return;
        }
        o = mitm[o].link;
    }
    // If we got here nothing was found.
    // Stuff could have been destroyed or offered, either case we'll
    // have to reduce the timer vector anyway.
    while (!timer.empty() && quant-- > 0)

[12.16119]

[12.17001]

        timer2.push_back(timer[timer.size() - 1].get_long());

Replacement in crawl-ref/source/misc.cc at line 845 [8.1933596]
B:BD[12.17072] → [12.17072:17075]
B:BD[12.17075] → [9.17638:17796]
∅:D[9.17796] → [12.17233:17235]
B:BD[12.17233] → [12.17233:17235]
B:BD[12.17235] → [9.17797:17878]
∅:D[9.17878] → [12.17325:17342]
B:BD[12.17325] → [12.17325:17342]
B:BD[12.17342] → [16.3016:3052]
```
}
// Called from move_item_to_player.
// Quantities are set afterwards, so don't ASSERT for those.
void pick_up_blood_potions_stack(item_def &stack, int quant)
{
    ASSERT(quant > 0 && quant <= stack.quantity);
    if (!is_valid_item(stack))
        return;
    ASSERT(is_blood_potion(stack));
```
[12.17027]
[12.17514]
```
    }
```

Replacement in crawl-ref/source/misc.cc at line 847 [8.1933596]

B:BD[12.17515] → [12.17515:17556]

B:BD[12.17556] → [9.17879:17967]

∅:D[9.17967] → [12.17556:17591]

B:BD[12.17556] → [12.17556:17591]

B:BD[12.17591] → [9.17968:18022]

∅:D[9.18022] → [12.17632:17661]

B:BD[12.17632] → [12.17632:17661]

B:BD[12.17661] → [13.5149:5226]

∅:D[13.5226] → [12.17737:18013]

B:BD[12.17737] → [12.17737:18013]

B:BD[12.18013] → [9.18023:18138]

∅:D[9.18138] → [12.18013:18057]

B:BD[12.18013] → [12.18013:18057]

B:BD[12.18057] → [9.18139:18203]

∅:D[9.18203] → [12.18108:18109]

B:BD[12.18108] → [12.18108:18109]

B:BD[12.18109] → [13.5227:5269]

∅:D[13.5269] → [12.18150:18194]

B:BD[12.18150] → [12.18150:18194]

B:BD[12.18194] → [9.18204:18336]

∅:D[9.18336] → [12.18246:18247]

B:BD[12.18246] → [12.18246:18247]

B:BD[12.18247] → [13.5270:5300]

∅:D[13.5300] → [12.18334:18366]

B:BD[12.18334] → [12.18334:18366]

B:BD[12.18478] → [12.18478:18514]

B:BD[12.18515] → [12.18515:18561]

    CrawlHashTable &props = stack.props;
    if (!props.exists("timer"))
        init_stack_blood_potions(stack, stack.special);
    ASSERT(props.exists("timer"));
    CrawlVector &timer = props["timer"].get_vector();
    ASSERT(!timer.empty());
    // First check whether we can merge with an existing stack in inventory.
    for (int m = 0; m < ENDOFPACK; m++)
    {
        if (!is_valid_item(you.inv[m]))
            continue;
        if (you.inv[m].base_type == OBJ_POTIONS
            && you.inv[m].sub_type == stack.sub_type)
        {
            CrawlHashTable &props2 = you.inv[m].props;
            if (!props2.exists("timer"))
                init_stack_blood_potions(you.inv[m], you.inv[m].special);
            ASSERT(props2.exists("timer"));
            CrawlVector &timer2 = props2["timer"].get_vector();
            // Update timer -> push(pop).
            for (int i = 0; i < quant; i++)
            {
                timer2.push_back(timer[timer.size() - 1].get_long());
                timer.pop_back();
            }
            // Re-sort timer.
            _long_sort(timer2);
            return;
        }
    }
    // If we got here nothing was found. Huh?

[12.17515]

[12.18605]

    // Re-sort timer.
    _long_sort(timer2);

Insertion in crawl-ref/source/items.h at line 50 [8.2580284]

[3.3534]

[17.144271]

void merge_item_stacks(item_def &source, item_def &dest,
                       int quant = -1);

Insertion in crawl-ref/source/items.cc at line 1409 [8.2584728]

[3.4122]

[18.352338]

}
void merge_item_stacks(item_def &source, item_def &dest, int quant)
{
    if (quant == -1)
        quant = source.quantity;
    ASSERT(quant > 0 && quant <= source.quantity);
    if (is_blood_potion(source) && is_blood_potion(dest))
       merge_blood_potion_stacks(source, dest, quant);

Replacement in crawl-ref/source/items.cc at line 1613 [8.2584728]

∅:D[4.3427] → [16.3234:3282]

B:BD[8.2615507] → [16.3234:3282]

∅:D[16.3282] → [9.21123:21194]

B:BD[11.11379] → [9.21123:21194]

                if (is_blood_potion(mitm[obj]))
                    pick_up_blood_potions_stack(mitm[obj], quant_got);

[4.3427]

[16.3283]

                merge_item_stacks(mitm[obj], you.inv[m], quant_got);

Insertion in crawl-ref/source/items.cc at line 1758 [8.2584728]
[10.40658]
[10.40658]
```
                merge_item_stacks(item, *si);
```

Insertion in crawl-ref/source/items.cc at line 1851 [8.2584728]

[10.41885]

[9.21743]

                item_def copy = item;
                merge_item_stacks(copy, *si, quant_drop);

Deletion in crawl-ref/source/items.cc at line 1854 [8.2584728]
B:BD[9.21744] → [16.3322:3365]
∅:D[16.3365] → [11.11734:11752]
∅:D[19.8763] → [11.11734:11752]
B:BD[11.11734] → [11.11734:11752]
B:BD[11.11752] → [9.21745:21787]
B:BD[9.21787] → [10.41886:41953]
∅:D[9.21867] → [11.11998:12016]
∅:D[10.41953] → [11.11998:12016]
B:BD[11.11998] → [11.11998:12016]
B:BD[11.12016] → [9.21868:21869]
```
                if (is_blood_potion(item))
                {
                    item_def help = item;
                    drop_blood_potions_stack(help, quant_drop, p);
                }
```

Replacement in crawl-ref/source/debug.cc at line 1583 [8.4016436]

B:BD[20.11781] → [20.11781:11826]

            init_stack_blood_potions(*item);

[20.11781]

[20.11826]

        {
            const char* prompt;
            if (item->sub_type == POT_BLOOD)
                prompt = "# turns away from coagulation? "
                         "[ENTER for fully fresh] ";
            else
                prompt = "# turns away from rotting? "
                         "[ENTER for fully fresh] ";
            int age =
                _debug_prompt_for_int(prompt, false);
            if (age <= 0)
                age = -1;
            else if (item->sub_type == POT_BLOOD)
                age += 500;
            init_stack_blood_potions(*item, age);
        }

Replacement in crawl-ref/source/debug.cc at line 5005 [8.4016436]
∅:D[6.10960] → [21.15517:15557]
B:BD[21.15517] → [21.15517:15557]
```
    if (mon->inv[mon_slot] != NON_ITEM)
```
[6.10960]
[21.15557]
```
    if (mon->inv[mon_slot] != NON_ITEM
        && !items_stack(item, mitm[mon->inv[mon_slot]]))
```