fiddlerwoaroof/crawl - Change 7X5YDPAU34LOFKEGJYE6GC7EOEDKGT3O6CUGZBYJI45L3FQOAKHQC

Consolidate the routines to remove the player's condensation shield into

one function.

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

Created by dolorous on November 7, 2008

7X5YDPAU34LOFKEGJYE6GC7EOEDKGT3O6CUGZBYJI45L3FQOAKHQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/spells4.h at line 15 [7.434549]
[6.46673]
[6.46673]
```
struct dist;
```
Insertion in crawl-ref/source/spells4.h at line 25 [7.434549]
[7.435100]
[7.435100]
```
void remove_condensation_shield();
```

Insertion in crawl-ref/source/spells4.cc at line 2382 [7.436250]

[8.3702]

[9.1288]

}
void remove_condensation_shield()
{
    mpr("Your icy shield dissipates!", MSGCH_DURATION);
    you.duration[DUR_CONDENSATION_SHIELD] = 0;
    you.redraw_armour_class = true;

Insertion in crawl-ref/source/spells4.cc at line 2405 [7.436250]

[7.523363]

[9.1347]

            you.duration[DUR_CONDENSATION_SHIELD] = 10 + roll_dice(2, pow / 5);

Deletion in crawl-ref/source/spells4.cc at line 2407 [7.436250]
∅:D[9.1391] → [7.523404:523485]
B:BD[7.523404] → [7.523404:523485]
```
            you.duration[DUR_CONDENSATION_SHIELD] = 10 + roll_dice(2, pow / 5);
```
Deletion in crawl-ref/source/spells4.cc at line 2412 [7.436250]
B:BD[7.523614] → [7.523614:523627]
```
    return;
```

Replacement in crawl-ref/source/spells4.cc at line 2431 [7.436250]

B:BD[10.575] → [10.575:633]

        if (you.shield() || you.duration[DUR_FIRE_SHIELD]

[10.575]

[10.633]

        if (you.shield()
            || you.duration[DUR_FIRE_SHIELD]

Insertion in crawl-ref/source/spells3.cc at line 45 [7.531613]
[7.532443]
[7.532443]
```
#include "spells4.h"
```
Replacement in crawl-ref/source/spells3.cc at line 1249 [7.531613]
B:BD[7.549290] → [7.549290:549347]
B:BD[7.549347] → [2.208:248]
∅:D[2.248] → [7.549384:549390]
B:BD[7.549384] → [7.549384:549390]
```
    {
        you.duration[DUR_CONDENSATION_SHIELD] = 0;
        you.redraw_armour_class = true;
    }
```
[7.549290]
[7.549390]
```
        remove_condensation_shield();
```

Replacement in crawl-ref/source/spells1.cc at line 185 [7.616635]

B:BD[7.619384] → [11.7662:7734]

∅:D[11.7734] → [7.619439:619504]

B:BD[7.619439] → [7.619439:619504]

B:BD[7.619504] → [12.288:332]

∅:D[12.332] → [7.619545:619555]

B:BD[7.619545] → [7.619545:619555]

        if (you.duration[DUR_CONDENSATION_SHIELD] > 0 && !wizard_blink)
        {
            you.duration[DUR_CONDENSATION_SHIELD] = 0;
            you.redraw_armour_class = true;
        }

[7.619384]

[7.619555]

        if (!wizard_blink && you.duration[DUR_CONDENSATION_SHIELD] > 0)
            remove_condensation_shield();

Insertion in crawl-ref/source/spells1.cc at line 197 [7.616635]
[7.619670]
[13.11860]
```
    bool success = false;
```
Deletion in crawl-ref/source/spells1.cc at line 199 [7.616635]
∅:D[13.11882] → [7.619686:619709]
B:BD[7.619686] → [7.619686:619709]
```
    bool succ = false;
```
Replacement in crawl-ref/source/spells1.cc at line 222 [7.616635]
B:BD[7.620435] → [7.620435:620456]
```
        succ = true;
```
[7.620435]
[7.620456]
```
        success = true;
```
Deletion in crawl-ref/source/spells1.cc at line 225 [7.616635]
B:BD[7.620469] → [7.620469:620470]
Replacement in crawl-ref/source/spells1.cc at line 232 [7.616635]
B:BD[7.620513] → [7.620513:620534]
```
        succ = true;
```
[14.718]
[13.11996]
```
        success = true;
```
Replacement in crawl-ref/source/spells1.cc at line 237 [7.616635]
B:BD[7.620636] → [7.620636:620673]
```
            abyss_teleport( false );
```
[7.620636]
[15.413]
```
            abyss_teleport(false);
```

Replacement in crawl-ref/source/spells1.cc at line 243 [7.616635]

B:BD[7.620728] → [7.620728:620844]

B:BD[7.620844] → [12.333:373]

∅:D[12.373] → [7.620881:620887]

B:BD[7.620881] → [7.620881:620887]

    if (succ && you.duration[DUR_CONDENSATION_SHIELD] > 0)
    {
        you.duration[DUR_CONDENSATION_SHIELD] = 0;
        you.redraw_armour_class = true;
    }

[7.620728]

[12.374]

    if (success && you.duration[DUR_CONDENSATION_SHIELD] > 0)
        remove_condensation_shield();

Insertion in crawl-ref/source/player.h at line 423 [7.945993]
[7.962260]
[5.2446]
```
bool napalm_player(int amount);
void dec_napalm_player();
```
Insertion in crawl-ref/source/player.cc at line 2538 [7.962854]
[16.1185]
[16.1185]
```
        {
```
Insertion in crawl-ref/source/player.cc at line 2540 [7.962854]
[16.1258]
[7.1001919]
```
        }
```
Insertion in crawl-ref/source/ouch.cc at line 59 [7.1104358]
[7.1106313]
[6.58722]
```
#include "spells4.h"
```

Replacement in crawl-ref/source/ouch.cc at line 85 [7.1104358]

B:BD[7.1106918] → [7.1106918:1107049]

B:BD[7.1107049] → [17.4056:4100]

∅:D[17.4100] → [7.1107090:1107100]

B:BD[7.1107090] → [7.1107090:1107100]

        {
            mpr( "Your icy shield dissipates!", MSGCH_DURATION );
            you.duration[DUR_CONDENSATION_SHIELD] = 0;
            you.redraw_armour_class = true;
        }

[7.1106918]

[7.1107100]

            remove_condensation_shield();

Replacement in crawl-ref/source/ouch.cc at line 601 [7.1104358]

B:BD[18.366570] → [18.366570:366754]

        {
            mprf(MSGCH_DURATION, "Your icy shield dissipates!");
            you.duration[DUR_CONDENSATION_SHIELD] = 0;
            you.redraw_armour_class = true;
        }

[18.366570]

[7.1116058]

            remove_condensation_shield();

Replacement in crawl-ref/source/ouch.cc at line 604 [7.1104358]
B:BD[18.366756] → [18.366756:366774]
```
    if (strength)
```
[18.366756]
[19.4917]
```
    if (strength > 0)
```
Insertion in crawl-ref/source/delay.cc at line 38 [7.3963459]
[20.55577]
[7.3964008]
```
#include "spells4.h"
```

Replacement in crawl-ref/source/delay.cc at line 1278 [7.3963459]

B:BD[3.7679] → [3.7679:7871]

        if (you.duration[DUR_CONDENSATION_SHIELD])
        {
            mpr( "Your icy shield evaporates.", MSGCH_DURATION );
            you.duration[DUR_CONDENSATION_SHIELD] = 0;
        }

[3.7679]

[3.7871]

        if (you.duration[DUR_CONDENSATION_SHIELD] > 0)
            remove_condensation_shield();

Insertion in crawl-ref/source/cloud.cc at line 24 [7.4095717]
[21.3089]
[7.4096041]
```
#include "spells4.h"
```

Replacement in crawl-ref/source/cloud.cc at line 458 [7.4095717]

B:BD[21.4919] → [21.4919:5036]

B:BD[21.5036] → [17.6811:6851]

∅:D[17.6851] → [21.5073:5079]

B:BD[21.5073] → [21.5073:5079]

    {
        mpr("Your icy shield dissipates!", MSGCH_DURATION);
        you.duration[DUR_CONDENSATION_SHIELD] = 0;
        you.redraw_armour_class = true;
    }

[21.4919]

[21.5079]

        remove_condensation_shield();

Insertion in crawl-ref/source/acr.cc at line 98 [7.4397395]
[7.4400751]
[7.4400772]
```
#include "spells4.h"
```

Replacement in crawl-ref/source/acr.cc at line 2557 [7.4397395]

B:BD[7.4440705] → [7.4440705:4440834]

B:BD[7.4440834] → [22.852:896]

∅:D[22.896] → [7.4440875:4440885]

B:BD[7.4440875] → [7.4440875:4440885]

        {
            mpr("Your icy shield dissipates!", MSGCH_DURATION);
            you.duration[DUR_CONDENSATION_SHIELD] = 0;
            you.redraw_armour_class = true;
        }

[7.4440705]

[7.4440885]

            remove_condensation_shield();

Replacement in crawl-ref/source/acr.cc at line 2713 [7.4397395]

B:BD[7.4447781] → [4.3376:3499]

∅:D[4.3499] → [23.3519:3559]

∅:D[24.24001] → [23.3519:3559]

B:BD[23.3519] → [23.3519:3559]

B:BD[23.3559] → [4.3500:3506]

    if (_decrement_a_duration(DUR_CONDENSATION_SHIELD,
                              "Your icy shield evaporates."))
    {
        you.redraw_armour_class = true;
    }

[7.4447781]

[7.4447887]

    if (_decrement_a_duration(DUR_CONDENSATION_SHIELD))
        remove_condensation_shield();

Replacement in crawl-ref/source/acr.cc at line 2718 [7.4397395]
B:BD[7.4448169] → [23.3637:3675]
```
        mpr( "You feel very cold." );
```
[7.4448169]
[25.8895]
```
        mpr("You feel very cold.");
```
Deletion in crawl-ref/source/acr.cc at line 2729 [7.4397395]
B:BD[4.3708] → [4.3708:3714]
```
    {
```
Deletion in crawl-ref/source/acr.cc at line 2730 [7.4397395]
B:BD[23.4008] → [4.3715:3721]
```
    }
```
Replacement in crawl-ref/source/acr.cc at line 2801 [7.4397395]
∅:D[26.11858] → [18.1267989:1268048]
B:BD[7.4452622] → [18.1267989:1268048]
```
        did_god_conduct( DID_STIMULANTS, 6 + random2(6) );
```
[26.11858]
[7.4452677]
```
        did_god_conduct(DID_STIMULANTS, 6 + random2(6));
```

Replacement in crawl-ref/source/acr.cc at line 2896 [7.4397395]

B:BD[27.1704] → [24.25897:25948]

        if ( _decrement_a_duration(DUR_LEVITATION,

[27.1704]

[24.25948]

        if (_decrement_a_duration(DUR_LEVITATION,

Replacement in crawl-ref/source/acr.cc at line 2899 [7.4397395]

B:BD[24.26069] → [24.26069:26149]

                                   "You are starting to lose your buoyancy!") )

[24.26069]

[7.4455034]

                                   "You are starting to lose your buoyancy!"))

Consolidate the routines to remove the player's condensation shield into

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/spells4.h at line 15 [7.434549]

Insertion in crawl-ref/source/spells4.h at line 25 [7.434549]

Insertion in crawl-ref/source/spells4.cc at line 2382 [7.436250]

Insertion in crawl-ref/source/spells4.cc at line 2405 [7.436250]

Deletion in crawl-ref/source/spells4.cc at line 2407 [7.436250]

Deletion in crawl-ref/source/spells4.cc at line 2412 [7.436250]

Replacement in crawl-ref/source/spells4.cc at line 2431 [7.436250]

Insertion in crawl-ref/source/spells3.cc at line 45 [7.531613]

Replacement in crawl-ref/source/spells3.cc at line 1249 [7.531613]

Replacement in crawl-ref/source/spells1.cc at line 185 [7.616635]

Insertion in crawl-ref/source/spells1.cc at line 197 [7.616635]

Deletion in crawl-ref/source/spells1.cc at line 199 [7.616635]

Replacement in crawl-ref/source/spells1.cc at line 222 [7.616635]

Deletion in crawl-ref/source/spells1.cc at line 225 [7.616635]

Replacement in crawl-ref/source/spells1.cc at line 232 [7.616635]

Replacement in crawl-ref/source/spells1.cc at line 237 [7.616635]

Replacement in crawl-ref/source/spells1.cc at line 243 [7.616635]

Insertion in crawl-ref/source/player.h at line 423 [7.945993]

Insertion in crawl-ref/source/player.cc at line 2538 [7.962854]

Insertion in crawl-ref/source/player.cc at line 2540 [7.962854]

Insertion in crawl-ref/source/ouch.cc at line 59 [7.1104358]

Replacement in crawl-ref/source/ouch.cc at line 85 [7.1104358]

Replacement in crawl-ref/source/ouch.cc at line 601 [7.1104358]

Replacement in crawl-ref/source/ouch.cc at line 604 [7.1104358]

Insertion in crawl-ref/source/delay.cc at line 38 [7.3963459]

Replacement in crawl-ref/source/delay.cc at line 1278 [7.3963459]

Insertion in crawl-ref/source/cloud.cc at line 24 [7.4095717]

Replacement in crawl-ref/source/cloud.cc at line 458 [7.4095717]

Insertion in crawl-ref/source/acr.cc at line 98 [7.4397395]

Replacement in crawl-ref/source/acr.cc at line 2557 [7.4397395]

Replacement in crawl-ref/source/acr.cc at line 2713 [7.4397395]

Replacement in crawl-ref/source/acr.cc at line 2718 [7.4397395]

Deletion in crawl-ref/source/acr.cc at line 2729 [7.4397395]

Deletion in crawl-ref/source/acr.cc at line 2730 [7.4397395]

Replacement in crawl-ref/source/acr.cc at line 2801 [7.4397395]

Replacement in crawl-ref/source/acr.cc at line 2896 [7.4397395]

Replacement in crawl-ref/source/acr.cc at line 2899 [7.4397395]