fiddlerwoaroof/crawl - Change MIC2SDBOCS63ZDNBQ2VRZMTFOYJL5DUQVR67I7Z3KBJGDBNZJIGAC

Clean up potion effects as per [2544231]; get rid of the "power == 40 means

it's a potion" hack. Fix security issue in dumping code (never dump a string without using %s.)

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

Created by haranp on January 29, 2009

MIC2SDBOCS63ZDNBQ2VRZMTFOYJL5DUQVR67I7Z3KBJGDBNZJIGAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spl-mis.cc at line 597 [5.461]

B:BD[5.17667] → [5.17667:17741]

        potion_effect(static_cast<potion_type>(pot_eff), pot_pow, false);

[5.17667]

[5.17741]

        potion_effect(static_cast<potion_type>(pot_eff), pot_pow, false, false);

Replacement in crawl-ref/source/item_use.cc at line 4025 [9.2781507]
B:BD[7.761248] → [8.5848594:5848617]
```
void drink( int slot )
```
[7.761248]
[9.2845156]
```
void drink(int slot)
```
Deletion in crawl-ref/source/item_use.cc at line 4027 [9.2781507]
B:BD[9.2845158] → [9.2845158:2845178]
```
    int item_slot;
```
Replacement in crawl-ref/source/item_use.cc at line 4061 [9.2781507]
∅:D[10.5260] → [8.5848847:5848902]
B:BD[11.572] → [8.5848847:5848902]
```
    if (slot != -1)
        item_slot = slot;
    else
```
[10.5260]
[12.7687]
```
    if (slot == -1)
```

Replacement in crawl-ref/source/item_use.cc at line 4063 [9.2781507]

B:BD[12.7693] → [13.6835:7081]

        item_slot = prompt_invent_item("Drink which item?",
                                       MT_INVLIST, OBJ_POTIONS,
                                       true, true, true, 0, -1, NULL,
                                       OPER_QUAFF);

[12.7693]

[12.7694]

        slot = prompt_invent_item("Drink which item?",
                                  MT_INVLIST, OBJ_POTIONS,
                                  true, true, true, 0, -1, NULL,
                                  OPER_QUAFF);
        if (prompt_failed(slot))
            return;

Replacement in crawl-ref/source/item_use.cc at line 4071 [9.2781507]
B:BD[12.7701] → [14.2975:3009]
∅:D[14.3009] → [9.2845787:2845803]
B:BD[9.2845787] → [9.2845787:2845803]
```
    if (prompt_failed(item_slot))
        return;
```
[12.7701]
[9.2845809]
```
    item_def& potion = you.inv[slot];
```
Replacement in crawl-ref/source/item_use.cc at line 4073 [9.2781507]
B:BD[9.2845810] → [9.2845810:2845863]
```
    if (you.inv[item_slot].base_type != OBJ_POTIONS)
```
[9.2845810]
[9.2845863]
```
    if (potion.base_type != OBJ_POTIONS)
```

Replacement in crawl-ref/source/item_use.cc at line 4079 [9.2781507]

B:BD[15.50043] → [15.50043:50110]

    const bool alreadyknown = item_type_known(you.inv[item_slot]);

[15.50043]

[9.2845929]

    const bool alreadyknown = item_type_known(potion);

Replacement in crawl-ref/source/item_use.cc at line 4082 [9.2781507]

∅:D[16.6457] → [17.3782:3891]

B:BD[17.3782] → [17.3782:3891]

        && (is_blood_potion(you.inv[item_slot])
            || you.inv[item_slot].sub_type == POT_PORRIDGE))

[16.6457]

[17.3891]

        && (is_blood_potion(potion) || potion.sub_type == POT_PORRIDGE))

Replacement in crawl-ref/source/item_use.cc at line 4088 [9.2781507]

B:BD[17.3969] → [16.6458:6530]

    if (alreadyknown && you.inv[item_slot].sub_type == POT_BERSERK_RAGE

[17.3969]

[16.6530]

    if (alreadyknown && potion.sub_type == POT_BERSERK_RAGE

Replacement in crawl-ref/source/item_use.cc at line 4100 [9.2781507]

∅:D[10.5262] → [18.4132:4209]

B:BD[15.50378] → [18.4132:4209]

B:BD[18.4209] → [19.10049:10090]

    if (potion_effect(static_cast<potion_type>(you.inv[item_slot].sub_type),
                      40, alreadyknown))

[10.5262]

[9.2845988]

    // Identify item and type.
    if (potion_effect(static_cast<potion_type>(potion.sub_type),
                      40, true, alreadyknown))

Replacement in crawl-ref/source/item_use.cc at line 4104 [9.2781507]

B:BD[9.2845994] → [13.7082:7146]

∅:D[13.7146] → [9.2846060:2846061]

B:BD[9.2846060] → [9.2846060:2846061]

B:BD[9.2846061] → [20.4468:4529]

        set_ident_flags(you.inv[item_slot], ISFLAG_IDENT_MASK);
        set_ident_type( you.inv[item_slot], ID_KNOWN_TYPE );

[9.2845994]

[9.2846186]

        set_ident_flags(potion, ISFLAG_IDENT_MASK);
        set_ident_type(potion, ID_KNOWN_TYPE);

Replacement in crawl-ref/source/item_use.cc at line 4109 [9.2781507]
B:BD[9.2846207] → [20.4530:4591]
```
        set_ident_type( you.inv[item_slot], ID_TRIED_TYPE );
```
[9.2846207]
[9.2846332]
```
        set_ident_type(potion, ID_TRIED_TYPE);
```
Insertion in crawl-ref/source/item_use.cc at line 4111 [9.2781507]
[9.2846338]
[15.50379]
Replacement in crawl-ref/source/item_use.cc at line 4119 [9.2781507]
B:BD[9.2846339] → [17.4040:4085]
```
    if (is_blood_potion(you.inv[item_slot]))
```
[9.2846339]
[21.23163]
```
    if (is_blood_potion(potion))
```
Replacement in crawl-ref/source/item_use.cc at line 4122 [9.2781507]
∅:D[22.4603] → [21.23207:23263]
B:BD[21.23207] → [21.23207:23263]
```
        remove_oldest_blood_potion(you.inv[item_slot]);
```
[22.4603]
[21.23263]
```
        remove_oldest_blood_potion(potion);
```
Replacement in crawl-ref/source/item_use.cc at line 4124 [9.2781507]
∅:D[21.23269] → [9.2846339:2846382]
B:BD[9.2846339] → [9.2846339:2846382]
```
    dec_inv_item_quantity( item_slot, 1 );
```
[21.23269]
[7.761427]
```
    dec_inv_item_quantity(slot, 1);
```

Replacement in crawl-ref/source/item_use.cc at line 4204 [9.2781507]

∅:D[23.34367] → [24.7213:7287]

B:BD[24.7213] → [24.7213:7287]

    potion_effect(fountain_effect, 100, feat != DNGN_FOUNTAIN_SPARKLING);

[23.34367]

[9.2848780]

    potion_effect(fountain_effect, 100, true, feat != DNGN_FOUNTAIN_SPARKLING);

Deletion in crawl-ref/source/it_use2.h at line 14 [9.2902964]
∅:D[25.91286] → [9.2903281:2903282]
B:BD[9.2903281] → [9.2903281:2903282]

Replacement in crawl-ref/source/it_use2.h at line 15 [9.2902964]

∅:D[19.10216] → [9.2903282:2903546]

B:BD[9.2903282] → [9.2903282:2903546]

B:BD[9.2903546] → [19.10217:10290]

∅:D[19.10290] → [9.2903590:2903808]

B:BD[9.2903590] → [9.2903590:2903808]

/* ***********************************************************************
 * called from: ability - beam - decks - item_use - misc - religion -
 *              spell - spells - spells1
 * *********************************************************************** */
bool potion_effect(potion_type pot_eff, int pow, bool was_known = true);
/* ***********************************************************************
 * called from: item_use
 * *********************************************************************** */
void unuse_randart(unsigned char unw);

[19.10216]

[9.2903808]

// drank_it should be true for real potion effects (as opposed
// to abilities which duplicate such effects.)
bool potion_effect(potion_type pot_eff, int pow,
                   bool drank_it = false, bool was_known = true);

Replacement in crawl-ref/source/it_use2.h at line 21 [9.2902964]

∅:D[7.766080] → [9.2903809:2904256]

B:BD[9.2903809] → [9.2903809:2904256]


/* ***********************************************************************
 * called from: item_use - transfor
 * *********************************************************************** */
void unwear_armour(char unw);
/* ***********************************************************************
 * called from: decks - it_use3 - item_use - items - spells3 - transfor
 * *********************************************************************** */

[7.766080]

[26.3965]

void unwear_armour(int slot);

Replacement in crawl-ref/source/it_use2.cc at line 41 [9.2904329]

B:BD[9.2905405] → [19.10292:10359]

bool potion_effect( potion_type pot_eff, int pow, bool was_known )

[9.2905405]

[9.2905449]

bool potion_effect(potion_type pot_eff, int pow, bool drank_it, bool was_known)

Replacement in crawl-ref/source/it_use2.cc at line 45 [9.2904329]
B:BD[9.2905573] → [9.2905573:2905611]
```
    if (pow > 150)
        pow = 150;
```
[9.2905573]
[27.2604]
```
    pow = std::min(pow, 150);
```

Replacement in crawl-ref/source/it_use2.cc at line 48 [9.2904329]

B:BD[3.2712] → [3.2712:2864]

                        && you.hunger_state < HS_SATIATED && pow == 40 ? 2
                                                                       : 1);

[3.2712]

[9.2905611]

                        && you.hunger_state < HS_SATIATED
                        && drank_it ? 2 : 1);

Replacement in crawl-ref/source/it_use2.cc at line 265 [9.2904329]
B:BD[9.2909621] → [28.9599:9622]
```
        if (pow == 40)
```
[9.2909621]
[29.369]
```
        if (drank_it)
```
Replacement in crawl-ref/source/it_use2.cc at line 387 [9.2904329]
B:BD[9.2912111] → [9.2912111:2912166]
```
}                               // end potion_effect()
```
[9.2912111]
[9.2912166]
```
}
```
Replacement in crawl-ref/source/it_use2.cc at line 391 [9.2904329]
B:BD[9.2912197] → [30.1335:1377]
B:BD[30.1377] → [31.3204:3223]
```
    const int unw = you.equip[EQ_WEAPON];
    if (unw == -1)
```
[9.2912197]
[32.3098]
```
    if (!you.weapon())
```
Insertion in crawl-ref/source/it_use2.cc at line 399 [9.2904329]
[32.3210]
[33.30400]
```
    item_def& item = *you.weapon();
```
Replacement in crawl-ref/source/it_use2.cc at line 402 [9.2904329]
∅:D[33.30401] → [26.4090:4143]
B:BD[30.1419] → [26.4090:4143]
```
    if (!safe_to_remove_or_wear(you.inv[unw], true))
```
[33.30401]
[26.4143]
```
    if (!safe_to_remove_or_wear(item, true))
```
Deletion in crawl-ref/source/it_use2.cc at line 409 [9.2904329]
∅:D[34.4065] → [9.2912262:2912263]
∅:D[35.7789] → [9.2912262:2912263]
B:BD[9.2912262] → [9.2912262:2912263]
B:BD[9.2912263] → [36.274:308]
```
    item_def &item(you.inv[unw]);
```
Replacement in crawl-ref/source/it_use2.cc at line 450 [9.2904329]
∅:D[36.743] → [9.2913256:2913288]
B:BD[9.2913256] → [9.2913256:2913288]
```
            unuse_randart(unw);
```
[36.743]
[9.2913288]
```
            unuse_randart(item);
```
Replacement in crawl-ref/source/it_use2.cc at line 520 [9.2904329]
B:BD[9.2915785] → [9.2915785:2915786]
B:BD[9.2915786] → [36.878:948]
```
    if (item.base_type == OBJ_STAVES && item.sub_type == STAFF_POWER)
```
[9.2915785]
[37.3552]
```
    else if (item.base_type == OBJ_STAVES && item.sub_type == STAFF_POWER)
```
Replacement in crawl-ref/source/it_use2.cc at line 529 [9.2904329]
∅:D[26.4216] → [9.2916248:2916302]
B:BD[9.2916248] → [9.2916248:2916302]
```
}                               // end unwield_item()
```
[26.4216]
[9.2916302]
```
}
```
Replacement in crawl-ref/source/it_use2.cc at line 532 [9.2904329]
B:BD[9.2916335] → [9.2916335:2916364]
```
void unwear_armour(char unw)
```
[9.2916335]
[9.2916364]
```
void unwear_armour(int slot)
```
Replacement in crawl-ref/source/it_use2.cc at line 537 [9.2904329]
B:BD[9.2916428] → [38.14314:14348]
```
    item_def &item(you.inv[unw]);
```
[9.2916428]
[38.14348]
```
    item_def &item(you.inv[slot]);
```
Deletion in crawl-ref/source/it_use2.cc at line 617 [9.2904329]
B:BD[9.2918208] → [9.2918208:2918281]
B:BD[9.2918294] → [39.6295:6297]
```
    if (is_random_artefact( you.inv[unw] ))
        unuse_randart(unw);
}
```
Replacement in crawl-ref/source/it_use2.cc at line 618 [9.2904329]
B:BD[9.2918350] → [9.2918350:2918390]
B:BD[9.2918390] → [7.767471:767506]
```
void unuse_randart(unsigned char unw)
{
    unuse_randart( you.inv[unw] );
```
[9.2918350]
[7.767506]
```
    if (is_random_artefact(item))
        unuse_randart(item);
```

Replacement in crawl-ref/source/decks.cc at line 1842 [9.3987460]

∅:D[22.17373] → [40.14680:14754]

B:BD[18.20926] → [40.14680:14754]

            potion_effect( POT_HEAL_WOUNDS, 40 ); // power doesn't matter

[22.17373]

[9.4000067]

            potion_effect(POT_HEAL_WOUNDS, 40); // power doesn't matter

Replacement in crawl-ref/source/decks.cc at line 1844 [9.3987460]
B:BD[9.4000080] → [18.20995:21041]
```
            cast_regen( random2(power / 4) );
```
[9.4000080]
[18.21041]
```
            cast_regen(random2(power / 4));
```

Replacement in crawl-ref/source/decks.cc at line 2575 [9.3987460]

B:BD[29.698] → [2.2679:2772]

∅:D[2.2772] → [29.788:860]

B:BD[29.788] → [29.788:860]

        // Use 41, not 40, to tell potion_effect() that this isn't a
        // real potion.
        potion_effect( coinflip() ? POT_DEGENERATION : POT_DECAY, 41 );

[29.698]

[29.860]

        potion_effect(coinflip() ? POT_DEGENERATION : POT_DECAY, 40);

Replacement in crawl-ref/source/debug.cc at line 1929 [9.4016436]

B:BD[4.5027] → [4.5027:5270]

    int j;
    // Set j == equipment slot of chosen item, remove old randart benefits.
    for (j = 0; j < NUM_EQUIP; j++)
    {
        if (you.equip[j] == i)
        {
            if (j == EQ_WEAPON)
                you.wield_change = true;

[4.5027]

[4.5270]

    if (you.weapon() == &item)
        you.wield_change = true;

Deletion in crawl-ref/source/debug.cc at line 1932 [9.4016436]

B:BD[4.5271] → [4.5271:5387]

            if (is_random_artefact( item ))
                unuse_randart( i );
            break;
        }
    }

Replacement in crawl-ref/source/debug.cc at line 1936 [9.4016436]

B:BD[4.5499] → [4.5499:5646]

            canned_msg( MSG_OK );
            // If equipped, re-apply benefits.
            if (j != NUM_EQUIP)
                use_randart( i );

[4.5499]

[4.5646]

            canned_msg(MSG_OK);

Insertion in crawl-ref/source/debug.cc at line 1939 [9.4016436]

[4.5676]


        if (item_is_equipped(item))
            unuse_randart(item);

Replacement in crawl-ref/source/debug.cc at line 1951 [9.4016436]

B:BD[4.5889] → [4.5889:5954]

    if (!cancelable_get_line( name, sizeof( name ) ) && name[0])

[4.5889]

[4.5954]

    if (!cancelable_get_line(name, sizeof( name )) && name[0])

Replacement in crawl-ref/source/debug.cc at line 1971 [9.4016436]
B:BD[4.6425] → [4.6425:6466]
```
    else if (!make_item_randart( item ))
```
[4.6425]
[4.6466]
```
    else if (!make_item_randart(item))
```

Replacement in crawl-ref/source/debug.cc at line 1984 [9.4016436]

B:BD[4.6746] → [4.6746:6796]

    if (j != NUM_EQUIP)
        use_randart( i );

[4.6746]

[9.4044581]

    if (item_is_equipped(item))
        use_randart(item);

Replacement in crawl-ref/source/debug.cc at line 1987 [9.4016436]
B:BD[9.4044582] → [4.6797:6849]
```
    mpr( item.name(DESC_INVENTORY_EQUIP).c_str() );
```
[9.4044582]
[4.6849]
```
    mpr(item.name(DESC_INVENTORY_EQUIP).c_str());
```
Replacement in crawl-ref/source/debug.cc at line 5955 [9.4016436]
B:BD[6.2932] → [6.2932:2971]
```
        fprintf(file, result.c_str());
```
[6.2932]
[6.2971]
```
        fprintf(file, "%s", result.c_str());
```
Replacement in crawl-ref/source/debug.cc at line 5973 [9.4016436]
B:BD[41.7553] → [6.3054:3089]
```
    fprintf(file, result.c_str());
```
[41.7553]
[41.7604]
```
    fprintf(file, "%s", result.c_str());
```

Replacement in crawl-ref/source/abl-show.cc at line 1439 [9.4494389]

B:BD[9.4518430] → [9.4518430:4518508]

        potion_effect( POT_INVISIBILITY, 2 * you.skills[SK_EVOCATIONS] + 5 );

[9.4518430]

[42.6907]

        potion_effect(POT_INVISIBILITY, 2 * you.skills[SK_EVOCATIONS] + 5);

Replacement in crawl-ref/source/abl-show.cc at line 1450 [9.4494389]

B:BD[9.4518789] → [9.4518789:4518866]

        potion_effect( POT_LEVITATION, 2 * you.skills[SK_EVOCATIONS] + 30 );

[9.4518789]

[9.4518866]

        potion_effect(POT_LEVITATION, 2 * you.skills[SK_EVOCATIONS] + 30);

Replacement in crawl-ref/source/abl-show.cc at line 1604 [9.4494389]

B:BD[9.4523256] → [9.4523256:4523324]

        potion_effect( POT_MIGHT, you.skills[SK_INVOCATIONS] * 8 );

[9.4523256]

[9.4523324]

        potion_effect(POT_MIGHT, you.skills[SK_INVOCATIONS] * 8);

Replacement in crawl-ref/source/abl-show.cc at line 1609 [9.4494389]

B:BD[9.4523603] → [9.4523603:4523671]

        potion_effect( POT_SPEED, you.skills[SK_INVOCATIONS] * 8 );

[9.4523603]

[9.4523671]

        potion_effect(POT_SPEED, you.skills[SK_INVOCATIONS] * 8);

Clean up potion effects as per [2544231]; get rid of the "power == 40 means

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/spl-mis.cc at line 597 [5.461]

Replacement in crawl-ref/source/item_use.cc at line 4025 [9.2781507]

Deletion in crawl-ref/source/item_use.cc at line 4027 [9.2781507]

Replacement in crawl-ref/source/item_use.cc at line 4061 [9.2781507]

Replacement in crawl-ref/source/item_use.cc at line 4063 [9.2781507]

Replacement in crawl-ref/source/item_use.cc at line 4071 [9.2781507]

Replacement in crawl-ref/source/item_use.cc at line 4073 [9.2781507]

Replacement in crawl-ref/source/item_use.cc at line 4079 [9.2781507]

Replacement in crawl-ref/source/item_use.cc at line 4082 [9.2781507]

Replacement in crawl-ref/source/item_use.cc at line 4088 [9.2781507]

Replacement in crawl-ref/source/item_use.cc at line 4100 [9.2781507]

Replacement in crawl-ref/source/item_use.cc at line 4104 [9.2781507]

Replacement in crawl-ref/source/item_use.cc at line 4109 [9.2781507]

Insertion in crawl-ref/source/item_use.cc at line 4111 [9.2781507]

Replacement in crawl-ref/source/item_use.cc at line 4119 [9.2781507]

Replacement in crawl-ref/source/item_use.cc at line 4122 [9.2781507]

Replacement in crawl-ref/source/item_use.cc at line 4124 [9.2781507]

Replacement in crawl-ref/source/item_use.cc at line 4204 [9.2781507]

Deletion in crawl-ref/source/it_use2.h at line 14 [9.2902964]

Replacement in crawl-ref/source/it_use2.h at line 15 [9.2902964]

Replacement in crawl-ref/source/it_use2.h at line 21 [9.2902964]

Replacement in crawl-ref/source/it_use2.cc at line 41 [9.2904329]

Replacement in crawl-ref/source/it_use2.cc at line 45 [9.2904329]

Replacement in crawl-ref/source/it_use2.cc at line 48 [9.2904329]

Replacement in crawl-ref/source/it_use2.cc at line 265 [9.2904329]

Replacement in crawl-ref/source/it_use2.cc at line 387 [9.2904329]

Replacement in crawl-ref/source/it_use2.cc at line 391 [9.2904329]

Insertion in crawl-ref/source/it_use2.cc at line 399 [9.2904329]

Replacement in crawl-ref/source/it_use2.cc at line 402 [9.2904329]

Deletion in crawl-ref/source/it_use2.cc at line 409 [9.2904329]

Replacement in crawl-ref/source/it_use2.cc at line 450 [9.2904329]

Replacement in crawl-ref/source/it_use2.cc at line 520 [9.2904329]

Replacement in crawl-ref/source/it_use2.cc at line 529 [9.2904329]

Replacement in crawl-ref/source/it_use2.cc at line 532 [9.2904329]

Replacement in crawl-ref/source/it_use2.cc at line 537 [9.2904329]

Deletion in crawl-ref/source/it_use2.cc at line 617 [9.2904329]

Replacement in crawl-ref/source/it_use2.cc at line 618 [9.2904329]