fiddlerwoaroof/crawl - Change FTUAPIYW6B6MSONXQVPMEQQELJPBMIZOJPVTHCSL6QDKNQC2APSQC

Code cleanup for ignite_poison(), inspired by [2204223].

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

Created by haranp on January 8, 2009

FTUAPIYW6B6MSONXQVPMEQQELJPBMIZOJPVTHCSL6QDKNQC2APSQC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/spells4.cc at line 532 [3.436250]
B:BD[3.462935] → [3.462935:462936]
B:BD[3.462936] → [2.8344:8384]
```
    const int cloud = env.cgrid(where);
```
Replacement in crawl-ref/source/spells4.cc at line 533 [3.436250]
B:BD[3.462976] → [3.462976:463006]
```
    if (cloud != EMPTY_CLOUD)
```
[3.462976]
[3.463006]
```
    const int i = env.cgrid(where);
    if (i != EMPTY_CLOUD)
```

Replacement in crawl-ref/source/spells4.cc at line 536 [3.436250]

B:BD[3.463012] → [4.3462:3514]

        if (env.cloud[ cloud ].type == CLOUD_STINK)

[3.463012]

[3.463122]

        cloud_struct& cloud = env.cloud[i];
        if (cloud.type == CLOUD_STINK)

Replacement in crawl-ref/source/spells4.cc at line 540 [3.436250]
B:BD[3.463165] → [3.463165:463215]
```
            env.cloud[ cloud ].type = CLOUD_FIRE;
```
[3.463165]
[3.463215]
```
            cloud.type = CLOUD_FIRE;
```
Replacement in crawl-ref/source/spells4.cc at line 542 [3.436250]
B:BD[3.463216] → [3.463216:463259]
```
            env.cloud[ cloud ].decay /= 2;
```
[3.463216]
[3.463259]
```
            cloud.decay /= 2;
```

Replacement in crawl-ref/source/spells4.cc at line 544 [3.436250]

B:BD[3.463260] → [3.463260:463352]

            if (env.cloud[ cloud ].decay < 1)
                env.cloud[ cloud ].decay = 1;

[3.463260]

[3.463352]

            if (cloud.decay < 1)
                cloud.decay = 1;

Replacement in crawl-ref/source/spells4.cc at line 547 [3.436250]

B:BD[3.463362] → [4.3515:3573]

        else if (env.cloud[ cloud ].type == CLOUD_POISON)

[3.463362]

[3.463484]

        else if (cloud.type == CLOUD_POISON)

Replacement in crawl-ref/source/spells4.cc at line 550 [3.436250]
B:BD[3.463527] → [3.463527:463577]
```
            env.cloud[ cloud ].type = CLOUD_FIRE;
```
[3.463527]
[3.463577]
```
            cloud.type = CLOUD_FIRE;
```

Replacement in crawl-ref/source/spells4.cc at line 613 [3.436250]

B:BD[3.465711] → [3.465711:465833]

B:BD[3.465869] → [3.465869:465870]

B:BD[3.465870] → [5.4396:4444]

∅:D[5.4444] → [3.465917:465960]

B:BD[3.465917] → [3.465917:465960]

B:BD[3.465960] → [6.651:669]

    int damage = 0, strength = 0, pcount = 0, acount = 0, totalstrength = 0;
    char item;
    bool wasWielding = false;
    // Temp weapon of venom => temp fire brand.
    const int wpn = you.equip[EQ_WEAPON];
    if (wpn != -1

[3.465711]

[3.465979]

    // Poison branding becomes fire branding.
    if (you.weapon()

Replacement in crawl-ref/source/spells4.cc at line 616 [3.436250]

B:BD[3.466021] → [3.466021:466081]

        && get_weapon_brand( you.inv[wpn] ) == SPWPN_VENOM)

[3.466021]

[3.466081]

        && get_weapon_brand(*you.weapon()) == SPWPN_VENOM)

Replacement in crawl-ref/source/spells4.cc at line 618 [3.436250]

B:BD[3.466087] → [3.466087:466162]

        if (set_item_ego_type( you.inv[wpn], OBJ_WEAPONS, SPWPN_FLAMING ))

[3.466087]

[3.466162]

        if (set_item_ego_type(*you.weapon(), OBJ_WEAPONS, SPWPN_FLAMING))

Replacement in crawl-ref/source/spells4.cc at line 621 [3.436250]

B:BD[7.876] → [7.876:936]

                 you.inv[wpn].name(DESC_CAP_YOUR).c_str());

[7.876]

[3.466337]

                 you.weapon()->name(DESC_CAP_YOUR).c_str());

Replacement in crawl-ref/source/spells4.cc at line 624 [3.436250]

B:BD[3.466375] → [3.466375:466461]

            you.duration[DUR_WEAPON_BRAND] += 1 + you.duration[DUR_WEAPON_BRAND] / 2;

[3.466375]

[3.466461]

            you.duration[DUR_WEAPON_BRAND] +=
                1 + you.duration[DUR_WEAPON_BRAND] / 2;

Replacement in crawl-ref/source/spells4.cc at line 632 [3.436250]

B:BD[3.466584] → [3.466584:466607]

    totalstrength = 0;

[3.466584]

[3.466607]

    int totalstrength = 0;
    int ammo_burnt = 0;
    int potions_burnt = 0;
    bool was_wielding = false;

Replacement in crawl-ref/source/spells4.cc at line 637 [3.436250]
B:BD[3.466608] → [3.466608:466653]
```
    for (item = 0; item < ENDOFPACK; item++)
```
[3.466608]
[3.466653]
```
    for (int i = 0; i < ENDOFPACK; ++i)
```

Replacement in crawl-ref/source/spells4.cc at line 639 [3.436250]

B:BD[3.466659] → [3.466659:466696]

        if (!you.inv[item].quantity)

[3.466659]

[3.466696]

        item_def& item = you.inv[i];
        if (!is_valid_item(item))

Replacement in crawl-ref/source/spells4.cc at line 643 [3.436250]
B:BD[3.466719] → [3.466719:466741]
```
        strength = 0;
```
[3.466719]
[3.466741]
```
        int strength = 0;
```

Replacement in crawl-ref/source/spells4.cc at line 645 [3.436250]

B:BD[3.466742] → [3.466742:466795]

        if (you.inv[item].base_type == OBJ_MISSILES)

[3.466742]

[3.466795]

        if (item.base_type == OBJ_MISSILES && item.special == SPMSL_POISONED)

Replacement in crawl-ref/source/spells4.cc at line 647 [3.436250]

B:BD[3.466805] → [3.466805:466849]

B:BD[3.466849] → [5.4445:4496]

∅:D[5.4496] → [3.466901:466952]

B:BD[3.466901] → [3.466901:466952]

B:BD[3.466952] → [5.4497:4548]

∅:D[5.4548] → [3.467002:467016]

B:BD[3.467002] → [3.467002:467016]

            if (you.inv[item].special == 3)
            {
                // Burn poison ammo.
                strength = you.inv[item].quantity;
                acount  += you.inv[item].quantity;
            }

[3.466805]

[3.467016]

            // Burn poison ammo.
            strength = item.quantity;
            ammo_burnt += item.quantity;

Replacement in crawl-ref/source/spells4.cc at line 651 [3.436250]
B:BD[3.467026] → [3.467026:467079]
```
        if (you.inv[item].base_type == OBJ_POTIONS)
```
[3.467026]
[3.467079]
```
        else if (item.base_type == OBJ_POTIONS)
```

Replacement in crawl-ref/source/spells4.cc at line 653 [3.436250]

B:BD[3.467089] → [3.467089:467133]

            switch (you.inv[item].sub_type)

[3.467089]

[3.467133]

            // Burn poisonous potions.
            switch (item.sub_type)

Replacement in crawl-ref/source/spells4.cc at line 657 [3.436250]

B:BD[3.467183] → [3.467183:467240]

                strength += 20 * you.inv[item].quantity;

[3.467183]

[3.467240]

                strength = 20 * item.quantity;

Replacement in crawl-ref/source/spells4.cc at line 661 [3.436250]

B:BD[3.467327] → [3.467327:467384]

                strength += 10 * you.inv[item].quantity;

[3.467327]

[3.467384]

                strength = 10 * item.quantity;

Replacement in crawl-ref/source/spells4.cc at line 665 [3.436250]
B:BD[3.467451] → [3.467451:467479]
```
            } // end switch
```
[3.467451]
[3.467479]
```
            }
```

Replacement in crawl-ref/source/spells4.cc at line 668 [3.436250]

B:BD[3.467506] → [3.467506:467556]

                pcount += you.inv[item].quantity;

[3.467506]

[3.467556]

                potions_burnt += item.quantity;

Replacement in crawl-ref/source/spells4.cc at line 673 [3.436250]

B:BD[3.467599] → [3.467599:467685]

            you.inv[item].quantity = 0;
            if (item == you.equip[EQ_WEAPON])

[3.467599]

[3.467685]

            if (i == you.equip[EQ_WEAPON])

Replacement in crawl-ref/source/spells4.cc at line 675 [3.436250]

B:BD[3.467699] → [3.467699:467778]

                you.equip[EQ_WEAPON] = -1;
                wasWielding = true;

[3.467699]

[3.467778]

                unwield_item();
                was_wielding = true;

Insertion in crawl-ref/source/spells4.cc at line 678 [3.436250]

[3.467792]

                
            item_was_destroyed(item);
            destroy_item(item);

Replacement in crawl-ref/source/spells4.cc at line 686 [3.436250]
B:BD[3.467845] → [3.467845:467865]
```
    if (acount > 0)
```
[3.467845]
[8.154]
```
    if (ammo_burnt)
```
Replacement in crawl-ref/source/spells4.cc at line 689 [3.436250]
B:BD[3.467916] → [3.467916:467936]
```
    if (pcount > 0)
```
[3.467916]
[3.467936]
```
    if (potions_burnt)
```

Replacement in crawl-ref/source/spells4.cc at line 692 [3.436250]

B:BD[9.4304] → [9.4304:4417]

             pcount > 1 ? "Some" : "A",
             pcount > 1 ? "s" : "",
             pcount > 1 ? "" : "s");

[9.4304]

[3.468149]

             potions_burnt > 1 ? "Some" : "A",
             potions_burnt > 1 ? "s" : "",
             potions_burnt > 1 ? "" : "s");

Replacement in crawl-ref/source/spells4.cc at line 697 [3.436250]

B:BD[3.468156] → [3.468156:468225]

    if (wasWielding == true)
        canned_msg( MSG_EMPTY_HANDED );

[3.468156]

[3.468225]

    if (was_wielding)
        canned_msg(MSG_EMPTY_HANDED);

Insertion in crawl-ref/source/spells4.cc at line 709 [3.436250]
[3.468492]
[5.4549]
```
    int damage = 0;
```
Replacement in crawl-ref/source/spells4.cc at line 719 [3.436250]
B:BD[3.468928] → [3.468928:468974]
```
        damage = roll_dice( 3, 5 + pow / 7 );
```
[3.468928]
[3.468974]
```
        damage = roll_dice(3, 5 + pow / 7);
```
Replacement in crawl-ref/source/spells4.cc at line 723 [3.436250]
∅:D[5.4605] → [10.1297:1356]
B:BD[3.469007] → [10.1297:1356]
```
    damage += roll_dice( you.duration[DUR_POISONING], 6 );
```
[5.4605]
[3.469049]
```
    damage += roll_dice(you.duration[DUR_POISONING], 6);
```
Deletion in crawl-ref/source/spells4.cc at line 728 [3.436250]
B:BD[3.469118] → [3.469118:469119]
Replacement in crawl-ref/source/spells4.cc at line 731 [3.436250]
B:BD[3.469210] → [3.469210:469243]
```
            damage = damage / 3;
```
[3.469210]
[3.469243]
```
            damage /= 3;
```
Insertion in crawl-ref/source/spells4.cc at line 735 [3.436250]
[3.469292]
[3.469292]
```
            mpr("The poison in your system burns terribly!");
```
Deletion in crawl-ref/source/spells4.cc at line 737 [3.436250]
B:BD[3.469317] → [3.469317:469379]
```
            mpr("The poison in your system burns terribly!");
```
Replacement in crawl-ref/source/spells4.cc at line 755 [3.436250]
∅:D[5.4765] → [3.469834:469894]
B:BD[3.469834] → [3.469834:469894]
```
}                               // end cast_ignite_poison()
```
[5.4765]
[3.469894]
```
}
```
Deletion in crawl-ref/source/items.cc at line 517 [3.2584728]
B:BD[11.989] → [12.9717:9755]
```
    // Paranoia, shouldn't be needed.
```

Code cleanup for ignite_poison(), inspired by [2204223].

Dependencies

In channels

Change contents

Deletion in crawl-ref/source/spells4.cc at line 532 [3.436250]

Replacement in crawl-ref/source/spells4.cc at line 533 [3.436250]

Replacement in crawl-ref/source/spells4.cc at line 536 [3.436250]

Replacement in crawl-ref/source/spells4.cc at line 540 [3.436250]

Replacement in crawl-ref/source/spells4.cc at line 542 [3.436250]

Replacement in crawl-ref/source/spells4.cc at line 544 [3.436250]

Replacement in crawl-ref/source/spells4.cc at line 547 [3.436250]

Replacement in crawl-ref/source/spells4.cc at line 550 [3.436250]

Replacement in crawl-ref/source/spells4.cc at line 613 [3.436250]

Replacement in crawl-ref/source/spells4.cc at line 616 [3.436250]

Replacement in crawl-ref/source/spells4.cc at line 618 [3.436250]

Replacement in crawl-ref/source/spells4.cc at line 621 [3.436250]

Replacement in crawl-ref/source/spells4.cc at line 624 [3.436250]

Replacement in crawl-ref/source/spells4.cc at line 632 [3.436250]

Replacement in crawl-ref/source/spells4.cc at line 637 [3.436250]

Replacement in crawl-ref/source/spells4.cc at line 639 [3.436250]

Replacement in crawl-ref/source/spells4.cc at line 643 [3.436250]

Replacement in crawl-ref/source/spells4.cc at line 645 [3.436250]

Replacement in crawl-ref/source/spells4.cc at line 647 [3.436250]

Replacement in crawl-ref/source/spells4.cc at line 651 [3.436250]

Replacement in crawl-ref/source/spells4.cc at line 653 [3.436250]

Replacement in crawl-ref/source/spells4.cc at line 657 [3.436250]

Replacement in crawl-ref/source/spells4.cc at line 661 [3.436250]

Replacement in crawl-ref/source/spells4.cc at line 665 [3.436250]

Replacement in crawl-ref/source/spells4.cc at line 668 [3.436250]

Replacement in crawl-ref/source/spells4.cc at line 673 [3.436250]

Replacement in crawl-ref/source/spells4.cc at line 675 [3.436250]

Insertion in crawl-ref/source/spells4.cc at line 678 [3.436250]

Replacement in crawl-ref/source/spells4.cc at line 686 [3.436250]

Replacement in crawl-ref/source/spells4.cc at line 689 [3.436250]

Replacement in crawl-ref/source/spells4.cc at line 692 [3.436250]

Replacement in crawl-ref/source/spells4.cc at line 697 [3.436250]

Insertion in crawl-ref/source/spells4.cc at line 709 [3.436250]

Replacement in crawl-ref/source/spells4.cc at line 719 [3.436250]

Replacement in crawl-ref/source/spells4.cc at line 723 [3.436250]

Deletion in crawl-ref/source/spells4.cc at line 728 [3.436250]

Replacement in crawl-ref/source/spells4.cc at line 731 [3.436250]

Insertion in crawl-ref/source/spells4.cc at line 735 [3.436250]

Deletion in crawl-ref/source/spells4.cc at line 737 [3.436250]

Replacement in crawl-ref/source/spells4.cc at line 755 [3.436250]

Deletion in crawl-ref/source/items.cc at line 517 [3.2584728]