fiddlerwoaroof/crawl - Change 5US6HAZNUVFLJCSX3YLML7U4ZR7HHXU3VM7U6JJEEULNCIPD7B6QC

Code cleanups, mainly in clouds.

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

Created by haranp on January 31, 2009

5US6HAZNUVFLJCSX3YLML7U4ZR7HHXU3VM7U6JJEEULNCIPD7B6QC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/view.h at line 66 [5.13254]
B:BD[5.13646] → [6.6:38]
```
/* called from: beam - fight */
```

Deletion in crawl-ref/source/view.h at line 67 [5.13254]

B:BD[6.108] → [6.108:109]

∅:D[6.109] → [5.13646:13943]

B:BD[5.13646] → [5.13646:13943]


// last updated 29may2000 {dlb}
/* ***********************************************************************
 * called from: bang - beam - direct - effects - fight - monstuff -
 *              mstuff2 - spells1 - spells2
 * *********************************************************************** */

Deletion in crawl-ref/source/view.h at line 69 [5.13254]

∅:D[7.57] → [5.14261:14474]

B:BD[5.14261] → [5.14261:14474]


// last updated 12may2000 {dlb}
/* ***********************************************************************
 * called from: acr - view
 * *********************************************************************** */

Deletion in crawl-ref/source/view.h at line 74 [5.13254]

B:BD[5.14493] → [5.14493:14720]

// last updated 12may2000 {dlb}
/* ***********************************************************************
 * called from: direct - monstufff - view
 * *********************************************************************** */

Deletion in crawl-ref/source/view.h at line 83 [5.13254]

B:BD[5.15129] → [5.15129:15428]

// last updated 12may2000 {dlb}
/* ***********************************************************************
 * called from: acr - effects - it_use2 - it_use3 - item_use - spell -
 *              spells - spells3 - spells4
 * *********************************************************************** */

Deletion in crawl-ref/source/view.h at line 88 [5.13254]

B:BD[5.15482] → [5.15482:15697]

// last updated 12may2000 {dlb}
/* ***********************************************************************
 * called from: acr - spells3
 * *********************************************************************** */

Deletion in crawl-ref/source/view.h at line 89 [5.13254]

∅:D[8.64] → [5.16286:16497]

B:BD[5.16286] → [5.16286:16497]


// last updated 19jun2000 (gdl)
/* ***********************************************************************
 * called from: acr view
 * *********************************************************************** */

Deletion in crawl-ref/source/view.h at line 90 [5.13254]

B:BD[5.16527] → [5.16527:16743]


// last updated 02apr2001 (gdl)
/* ***********************************************************************
 * called from: view monstuff
 * *********************************************************************** */

Deletion in crawl-ref/source/view.h at line 91 [5.13254]
B:BD[9.43] → [10.6:7]
Deletion in crawl-ref/source/view.h at line 92 [5.13254]
∅:D[11.37] → [5.16775:16776]
∅:D[10.40] → [5.16775:16776]
∅:D[9.43] → [5.16775:16776]
B:BD[5.16775] → [5.16775:16776]
Deletion in crawl-ref/source/view.h at line 93 [5.13254]
∅:D[12.69] → [5.16776:16777]
∅:D[13.451] → [5.16776:16777]
B:BD[5.16776] → [5.16776:16777]
Deletion in crawl-ref/source/view.h at line 94 [5.13254]
∅:D[14.315] → [13.496:497]
B:BD[13.496] → [13.496:497]

Replacement in crawl-ref/source/view.cc at line 5183 [5.16817]

∅:D[15.138] → [16.7824:7934]

∅:D[10.958] → [16.7824:7934]

B:BD[17.2721] → [16.7824:7934]

                if (Options.tutorial_left && in_bounds(gc)
                    && crawl_view.in_grid_los(gc))

[10.958]

[17.2785]

                if (Options.tutorial_left
                    && in_bounds(gc)
                    && crawl_view.in_grid_los(gc)
                    && env.show(ep))

Replacement in crawl-ref/source/view.cc at line 5188 [5.16817]

B:BD[17.2803] → [16.7935:7988]

B:BD[16.7988] → [18.8:65]

∅:D[18.65] → [19.318:340]

B:BD[19.318] → [19.318:340]

B:BD[19.340] → [20.156:241]

B:BD[20.241] → [21.7195:7273]

∅:D[21.7273] → [20.377:403]

B:BD[20.377] → [20.377:403]

B:BD[20.403] → [22.7:72]

B:BD[22.72] → [21.7274:7346]

∅:D[21.7346] → [14.4073:4127]

B:BD[22.152] → [14.4073:4127]

∅:D[14.4127] → [22.153:179]

B:BD[23.358] → [22.153:179]

B:BD[22.179] → [21.7347:7419]

∅:D[21.7419] → [22.180:206]

B:BD[24.979] → [22.180:206]

B:BD[22.206] → [14.4128:4182]

B:BD[14.4182] → [21.7420:7491]

∅:D[21.7491] → [24.980:1042]

B:BD[16.8267] → [24.980:1042]

B:BD[24.1042] → [21.7492:7562]

∅:D[21.7562] → [24.1043:1104]

B:BD[16.8466] → [24.1043:1104]

B:BD[24.1104] → [21.7563:7633]

∅:D[21.7633] → [22.207:208]

B:BD[16.8664] → [22.207:208]

B:BD[22.208] → [4.299:348]

∅:D[4.348] → [22.265:340]

B:BD[22.265] → [22.265:340]

B:BD[22.340] → [14.4183:4260]

∅:D[14.4260] → [22.465:491]

B:BD[22.465] → [22.465:491]

B:BD[22.491] → [21.7634:7706]

∅:D[21.7706] → [22.571:597]

B:BD[22.571] → [22.571:597]

∅:D[22.597] → [19.857:879]

∅:D[16.8664] → [19.857:879]

B:BD[19.857] → [19.857:879]

                    const int object = env.show(ep);
                    if (object && Options.tutorial_left)
                    {
                        if (grid_is_escape_hatch(grd(gc)))
                        {
                            learned_something_new(TUT_SEEN_ESCAPE_HATCH, gc);
                        }
                        else if (grid_is_branch_stairs(grd(gc)))
                            learned_something_new(TUT_SEEN_BRANCH, gc);
                        else if (is_feature('>', gc))
                        {
                            learned_something_new(TUT_SEEN_STAIRS, gc);
                        }
                        else if (is_feature('_', gc))
                            learned_something_new(TUT_SEEN_ALTAR, gc);
                        else if (grd(gc) == DNGN_CLOSED_DOOR)
                            learned_something_new(TUT_SEEN_DOOR, gc);
                        else if (grd(gc) == DNGN_ENTER_SHOP)
                            learned_something_new(TUT_SEEN_SHOP, gc);
                        if (igrd(gc) != NON_ITEM
                            && Options.feature_item_brand != CHATTR_NORMAL
                            && (is_feature('>', gc) || is_feature('<', gc)))
                        {
                            learned_something_new(TUT_STAIR_BRAND, gc);
                        }
                    }

[17.2803]

[17.3288]

                    tutorial_observe_cell(gc);

Replacement in crawl-ref/source/tutorial.h at line 47 [17.3315]

B:BD[21.8186] → [21.8186:8245]

                           coord_def gc = coord_def(0,0));

[21.8186]

[25.165]

                           coord_def gc = coord_def());

Insertion in crawl-ref/source/tutorial.h at line 52 [17.3315]
[26.128]
[27.489]
```
void tutorial_observe_cell(const coord_def& gc);
```
Insertion in crawl-ref/source/tutorial.h at line 64 [17.3315]
[17.4547]
[17.5892]

Insertion in crawl-ref/source/tutorial.cc at line 3953 [17.5936]

[28.16820]


void tutorial_observe_cell(const coord_def& gc)
{
    if (grid_is_escape_hatch(grd(gc)))
        learned_something_new(TUT_SEEN_ESCAPE_HATCH, gc);
    else if (grid_is_branch_stairs(grd(gc)))
        learned_something_new(TUT_SEEN_BRANCH, gc);
    else if (is_feature('>', gc))
        learned_something_new(TUT_SEEN_STAIRS, gc);
    else if (is_feature('_', gc))
        learned_something_new(TUT_SEEN_ALTAR, gc);
    else if (grd(gc) == DNGN_CLOSED_DOOR)
        learned_something_new(TUT_SEEN_DOOR, gc);
    else if (grd(gc) == DNGN_ENTER_SHOP)
        learned_something_new(TUT_SEEN_SHOP, gc);
    if (igrd(gc) != NON_ITEM
        && Options.feature_item_brand != CHATTR_NORMAL
        && (is_feature('>', gc) || is_feature('<', gc)))
    {
        learned_something_new(TUT_STAIR_BRAND, gc);
    }
}

Replacement in crawl-ref/source/cloud.cc at line 30 [5.4095717]

B:BD[5.4096061] → [29.3342:3402]

B:BD[29.3402] → [30.31441:31516]

// Returns true if this cloud spreads out as it dissipates.
static unsigned char _actual_spread_rate(cloud_type type, int spread_rate)

[5.4096061]

[5.4096092]

static int _actual_spread_rate(cloud_type type, int spread_rate)

Replacement in crawl-ref/source/cloud.cc at line 33 [5.4095717]
∅:D[2.387] → [31.16509:16553]
B:BD[31.16509] → [31.16509:16553]
```
        return (unsigned char) spread_rate;
```
[2.387]
[31.16553]
```
        return spread_rate;
```
Replacement in crawl-ref/source/cloud.cc at line 69 [5.4095717]
B:BD[5.4096560] → [5.4096560:4096614]
```
    ASSERT( env.cloud[ cloud ].type == CLOUD_NONE );
```
[5.4096560]
[32.94050]
```
    ASSERT( env.cloud[cloud].type == CLOUD_NONE );
```

Replacement in crawl-ref/source/cloud.cc at line 72 [5.4095717]

∅:D[32.94099] → [30.31668:31755]

B:BD[5.4096614] → [30.31668:31755]

B:BD[30.31755] → [21.102452:102492]

∅:D[14.53032] → [30.31835:31879]

∅:D[21.102492] → [30.31835:31879]

B:BD[30.31835] → [30.31835:31879]

B:BD[30.31879] → [32.94100:94145]

∅:D[30.31879] → [31.16685:16735]

∅:D[32.94145] → [31.16685:16735]

B:BD[33.8676] → [31.16685:16735]

B:BD[31.16735] → [14.53033:53077]

    env.cloud[ cloud ].type        = type;
    env.cloud[ cloud ].decay       = decay;
    env.cloud[ cloud ].pos         = p;
    env.cloud[ cloud ].whose       = whose;
    env.cloud[ cloud ].killer      = killer;
    env.cloud[ cloud ].spread_rate = spread_rate;
    env.cgrid(p)                   = cloud;

[32.94099]

[5.4096781]

    cloud_struct& c = env.cloud[cloud];
    c.type        = type;
    c.decay       = decay;
    c.pos         = p;
    c.whose       = whose;
    c.killer      = killer;
    c.spread_rate = spread_rate;
    env.cgrid(p)  = cloud;

Replacement in crawl-ref/source/cloud.cc at line 134 [5.4095717]

B:BD[29.4983] → [30.32343:32416]

static void _dissipate_cloud(int cc, cloud_struct &cloud, int dissipate)

[29.4983]

[29.5055]

static void _dissipate_cloud(int cloudidx, int dissipate)

Insertion in crawl-ref/source/cloud.cc at line 136 [5.4095717]
[29.5057]
[30.32417]
```
    cloud_struct &cloud = env.cloud[cloudidx];
```
Replacement in crawl-ref/source/cloud.cc at line 148 [5.4095717]
B:BD[29.5337] → [29.5337:5365]
```
        delete_cloud( cc );
```
[29.5337]
[29.5365]
```
        delete_cloud(cloudidx);
```
Replacement in crawl-ref/source/cloud.cc at line 151 [5.4095717]
B:BD[29.5368] → [29.5368:5393]
```
void manage_clouds(void)
```
[29.5368]
[29.5393]
```
void manage_clouds()
```

Replacement in crawl-ref/source/cloud.cc at line 153 [5.4095717]

B:BD[29.5395] → [30.32580:32643]

∅:D[30.32643] → [29.5458:5545]

B:BD[29.5458] → [29.5458:5545]

    // Amount which cloud dissipates - must be unsigned! {dlb}
    unsigned int dissipate = 0;
    for (unsigned char cc = 0; cc < MAX_CLOUDS; cc++)

[29.5395]

[29.5545]

    for (int i = 0; i < MAX_CLOUDS; ++i)

Replacement in crawl-ref/source/cloud.cc at line 155 [5.4095717]

B:BD[29.5551] → [30.32644:32723]

        if (env.cloud[cc].type == CLOUD_NONE)   // No cloud -> next iteration.

[29.5551]

[29.5629]

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

Replacement in crawl-ref/source/cloud.cc at line 160 [5.4095717]
B:BD[29.5652] → [29.5652:5688]
```
        dissipate = you.time_taken;
```
[29.5652]
[29.5688]
```
        int dissipate = you.time_taken;
```

Replacement in crawl-ref/source/cloud.cc at line 162 [5.4095717]

B:BD[29.5689] → [29.5689:5761]

B:BD[29.5761] → [33.8923:8968]

B:BD[33.8968] → [21.102548:102606]

∅:D[21.102606] → [29.5937:5947]

B:BD[29.5937] → [29.5937:5947]

        // water -> flaming clouds:
        // lava -> freezing clouds:
        if (env.cloud[cc].type == CLOUD_FIRE
            && grd(env.cloud[cc].pos) == DNGN_DEEP_WATER)
        {

[29.5689]

[29.5947]

        // Fire clouds dissipate faster over water,
        // cold clouds dissipate faster over lava.
        if (cloud.type == CLOUD_FIRE && grd(cloud.pos) == DNGN_DEEP_WATER)

Replacement in crawl-ref/source/cloud.cc at line 166 [5.4095717]
B:BD[29.5975] → [29.5975:5985]
B:BD[29.5985] → [33.8969:9019]
B:BD[33.9019] → [21.102607:102664]
∅:D[21.102664] → [29.6168:6178]
B:BD[29.6168] → [29.6168:6178]
```
        }
        else if (env.cloud[cc].type == CLOUD_COLD
                 && grd(env.cloud[cc].pos) == DNGN_LAVA)
        {
```
[29.5975]
[29.6178]
```
        else if (cloud.type == CLOUD_COLD && grd(cloud.pos) == DNGN_LAVA)
```
Deletion in crawl-ref/source/cloud.cc at line 168 [5.4095717]
B:BD[29.6206] → [29.6206:6216]
```
        }
```

Replacement in crawl-ref/source/cloud.cc at line 169 [5.4095717]

B:BD[29.6336] → [34.4584:4648]

B:BD[34.4648] → [21.102665:102720]

        expose_items_to_element(cloud2beam(env.cloud[cc].type),
                                env.cloud[cc].pos, 2);

[29.6336]

[34.4715]

        expose_items_to_element(cloud2beam(cloud.type), cloud.pos, 2);

Replacement in crawl-ref/source/cloud.cc at line 171 [5.4095717]
B:BD[34.4716] → [30.32724:32780]
```
        _dissipate_cloud(cc, env.cloud[cc], dissipate);
```
[34.4716]
[29.6393]
```
        _dissipate_cloud(i, dissipate);
```

Replacement in crawl-ref/source/cloud.cc at line 177 [5.4095717]

B:BD[29.6501] → [29.6501:6548]

    if (env.cloud[ cloud ].type != CLOUD_NONE)

[29.6501]

[29.6548]

    cloud_struct& c = env.cloud[cloud];
    if (c.type != CLOUD_NONE)

Replacement in crawl-ref/source/cloud.cc at line 180 [5.4095717]

B:BD[29.6554] → [21.102721:102781]

        const coord_def cloud_pos = env.cloud[ cloud ].pos;

[29.6554]

[29.6654]

        c.type        = CLOUD_NONE;
        c.decay       = 0;
        c.whose       = KC_OTHER;
        c.killer      = KILL_NONE;
        c.spread_rate = 0;

Replacement in crawl-ref/source/cloud.cc at line 186 [5.4095717]

B:BD[29.6655] → [30.32784:32883]

B:BD[30.32883] → [21.102782:102822]

∅:D[21.102822] → [30.32973:33025]

B:BD[30.32973] → [30.32973:33025]

B:BD[30.33025] → [32.94421:94474]

∅:D[32.94474] → [30.33025:33070]

B:BD[30.33025] → [30.33025:33070]

B:BD[30.33070] → [14.54002:54057]

        env.cloud[ cloud ].type         = CLOUD_NONE;
        env.cloud[ cloud ].decay        = 0;
        env.cloud[ cloud ].pos.reset();
        env.cloud[ cloud ].whose        = KC_OTHER;
        env.cloud[ cloud ].killer       = KILL_NONE;
        env.cloud[ cloud ].spread_rate  = 0;
        env.cgrid(cloud_pos)            = EMPTY_CLOUD;

[29.6655]

[29.6862]

        env.cgrid(c.pos) = EMPTY_CLOUD;
        c.pos.reset();

Replacement in crawl-ref/source/cloud.cc at line 239 [5.4095717]

B:BD[35.1242] → [35.1242:1327]

    if (decay > 60)
        decay = 60;
    else if (decay < 10)
        decay = 10;

[35.1242]

[35.1327]

    decay = std::min(decay, 60);
    decay = std::max(decay, 10);

Deletion in crawl-ref/source/cloud.cc at line 278 [5.4095717]
∅:D[33.9558] → [5.4097742:4097793]
∅:D[14.54631] → [5.4097742:4097793]
B:BD[5.4097742] → [5.4097742:4097793]
```
    // that is, another cloud already there {dlb}
```

Replacement in crawl-ref/source/cloud.cc at line 280 [5.4095717]

B:BD[5.4097836] → [30.33162:33290]

∅:D[30.33290] → [5.4097966:4098094]

B:BD[5.4097966] → [5.4097966:4098094]

B:BD[5.4098094] → [29.7181:7241]

∅:D[29.7241] → [5.4098094:4098164]

B:BD[5.4098094] → [5.4098094:4098164]

        if (env.cloud[ target_cgrid ].type >= CLOUD_GREY_SMOKE
                && env.cloud[ target_cgrid ].type <= CLOUD_STEAM
            || env.cloud[ target_cgrid ].type == CLOUD_STINK
            || env.cloud[ target_cgrid ].type == CLOUD_BLACK_SMOKE
            || env.cloud[ target_cgrid ].type == CLOUD_MIST
            || env.cloud[ target_cgrid ].decay <= 20)     //soon gone

[5.4097836]

[5.4098164]

        // There's already a cloud here. See if we can overwrite it.
        cloud_struct& old_cloud = env.cloud[target_cgrid];
        if (old_cloud.type >= CLOUD_GREY_SMOKE && old_cloud.type <= CLOUD_STEAM
            || old_cloud.type == CLOUD_STINK
            || old_cloud.type == CLOUD_BLACK_SMOKE
            || old_cloud.type == CLOUD_MIST
            || old_cloud.decay <= 20) // soon gone

Replacement in crawl-ref/source/cloud.cc at line 288 [5.4095717]

B:BD[5.4098174] → [14.54632:54721]

            cl_new = env.cgrid(ctarget);
            delete_cloud( env.cgrid(ctarget) );

[5.4098174]

[5.4098297]

            // Delete this cloud and replace it.
            cl_new = target_cgrid;
            delete_cloud(target_cgrid);

Replacement in crawl-ref/source/cloud.cc at line 292 [5.4095717]
B:BD[5.4098307] → [5.4098307:4098330]
```
        else
        {
```
[5.4098307]
[5.4098330]
```
        else                    // Guess not.
```
Deletion in crawl-ref/source/cloud.cc at line 294 [5.4095717]
B:BD[5.4098350] → [5.4098350:4098360]
```
        }
```

Replacement in crawl-ref/source/cloud.cc at line 296 [5.4095717]

B:BD[5.4098367] → [30.33291:33369]

    unsigned char spread_rate = _actual_spread_rate( cl_type, _spread_rate );

[5.4098367]

[31.17346]

    const int spread_rate = _actual_spread_rate(cl_type, _spread_rate);

Replacement in crawl-ref/source/cloud.cc at line 302 [5.4095717]
∅:D[30.33463] → [5.4098500:4098544]
B:BD[5.4098500] → [5.4098500:4098544]
```
        int cl_del = random2( MAX_CLOUDS );
```
[30.33463]
[5.4098544]
```
        int cl_del = random2(MAX_CLOUDS);
```

Replacement in crawl-ref/source/cloud.cc at line 306 [5.4095717]

B:BD[5.4098603] → [30.33464:33580]

∅:D[30.33580] → [5.4098721:4098837]

B:BD[5.4098721] → [5.4098721:4098837]

B:BD[5.4098837] → [29.7242:7296]

∅:D[29.7296] → [5.4098837:4098901]

B:BD[5.4098837] → [5.4098837:4098901]

            if (env.cloud[ ci ].type >= CLOUD_GREY_SMOKE
                    && env.cloud[ ci ].type <= CLOUD_STEAM
                || env.cloud[ ci ].type == CLOUD_STINK
                || env.cloud[ ci ].type == CLOUD_BLACK_SMOKE
                || env.cloud[ ci ].type == CLOUD_MIST
                || env.cloud[ ci ].decay <= 20)     //soon gone

[5.4098603]

[5.4098901]

            cloud_struct& cloud = env.cloud[ci];
            if (cloud.type >= CLOUD_GREY_SMOKE && cloud.type <= CLOUD_STEAM
                || cloud.type == CLOUD_STINK
                || cloud.type == CLOUD_BLACK_SMOKE
                || cloud.type == CLOUD_MIST
                || cloud.decay <= 20) // soon gone

Replacement in crawl-ref/source/cloud.cc at line 318 [5.4095717]
B:BD[5.4098992] → [5.4098992:4099024]
```
        delete_cloud( cl_del );
```
[5.4098992]
[5.4099024]
```
        delete_cloud(cl_del);
```
Insertion in crawl-ref/source/acr.cc at line 276 [5.4397395]
[27.39826]
[3.4036]
```
    _prep_input();
```
Deletion in crawl-ref/source/acr.cc at line 282 [5.4397395]
B:BD[3.4223] → [3.4223:4242]
```
    _prep_input();
```

Insertion in crawl-ref/source/acr.cc at line 2494 [5.4397395]

[36.7196]

[37.8815]

}
static void _regenerate_hp_and_mp()
{
    // XXX: using an int tmp to fix the fact that hit_points_regeneration
    // is only an unsigned char and is thus likely to overflow. -- bwr
    int tmp = you.hit_points_regeneration;
    if (you.hp < you.hp_max && !you.disease && !you.duration[DUR_DEATHS_DOOR])
        tmp += player_regen();
    while (tmp >= 100)
    {
        inc_hp(1, false);
        tmp -= 100;
    }
    ASSERT( tmp >= 0 && tmp < 100 );
    you.hit_points_regeneration = static_cast<unsigned char>(tmp);
    // XXX: Doing the same as the above, although overflow isn't an
    // issue with magic point regeneration, yet. -- bwr
    tmp = you.magic_points_regeneration;
    if (you.magic_points < you.max_magic_points)
        tmp += 7 + you.max_magic_points / 2;
    while (tmp >= 100)
    {
        inc_mp(1, false);
        tmp -= 100;
    }
    ASSERT( tmp >= 0 && tmp < 100 );
    you.magic_points_regeneration = static_cast<unsigned char>(tmp);

Deletion in crawl-ref/source/acr.cc at line 2557 [5.4397395]
∅:D[38.26373] → [37.8819:8820]
B:BD[39.1662] → [37.8819:8820]
Deletion in crawl-ref/source/acr.cc at line 2558 [5.4397395]
∅:D[38.26395] → [40.435:436]
B:BD[37.8840] → [40.435:436]
Deletion in crawl-ref/source/acr.cc at line 2597 [5.4397395]
B:BD[5.4458920] → [5.4458920:4458921]
Replacement in crawl-ref/source/acr.cc at line 2598 [5.4397395]
B:BD[5.4458963] → [5.4458963:4459002]
```
        make_hungry( food_use, true );
```
[5.4458963]
[5.4459002]
```
        make_hungry(food_use, true);
```

Replacement in crawl-ref/source/acr.cc at line 2600 [5.4397395]

B:BD[5.4459003] → [5.4459003:4459213]

    // XXX: using an int tmp to fix the fact that hit_points_regeneration
    // is only an unsigned char and is thus likely to overflow. -- bwr
    int tmp = static_cast< int >( you.hit_points_regeneration );

[5.4459003]

[5.4459213]

    _regenerate_hp_and_mp();

Deletion in crawl-ref/source/acr.cc at line 2602 [5.4397395]

B:BD[5.4459214] → [41.18998:19077]

∅:D[41.19077] → [5.4459279:4459340]

B:BD[5.4459279] → [5.4459279:4459340]

B:BD[5.4459492] → [5.4459492:4459538]

∅:D[42.1271000] → [5.4459538:4459966]

B:BD[5.4459538] → [5.4459538:4459966]

B:BD[5.4460138] → [5.4460138:4460184]

∅:D[42.1271034] → [5.4460184:4460301]

B:BD[5.4460184] → [5.4460184:4460301]

B:BD[5.4460301] → [42.1271035:1271036]

    if (you.hp < you.hp_max && !you.disease && !you.duration[DUR_DEATHS_DOOR])
        tmp += player_regen();
    while (tmp >= 100)
    {
        inc_hp(1, false);
        tmp -= 100;
    }
    ASSERT( tmp >= 0 && tmp < 100 );
    you.hit_points_regeneration = static_cast< unsigned char >( tmp );
    // XXX: Doing the same as the above, although overflow isn't an
    // issue with magic point regeneration, yet. -- bwr
    tmp = static_cast< int >( you.magic_points_regeneration );
    if (you.magic_points < you.max_magic_points)
        tmp += 7 + you.max_magic_points / 2;
    while (tmp >= 100)
    {
        inc_mp(1, false);
        tmp -= 100;
    }
    ASSERT( tmp >= 0 && tmp < 100 );
    you.magic_points_regeneration = static_cast< unsigned char >( tmp );

Replacement in crawl-ref/source/abl-show.cc at line 2353 [5.4494389]
B:BD[5.4547233] → [43.8010:8043]
```
void set_god_ability_slots(void)
```
[5.4547233]
[5.4547303]
```
void set_god_ability_slots()
```
Deletion in crawl-ref/source/abl-show.cc at line 2356 [5.4494389]
∅:D[43.8084] → [5.4547347:4547359]
B:BD[5.4547347] → [5.4547347:4547359]
```
    int i;
```
Replacement in crawl-ref/source/abl-show.cc at line 2360 [5.4494389]
∅:D[44.758] → [5.4548726:4548755]
∅:D[30.43428] → [5.4548726:4548755]
B:BD[5.4548726] → [5.4548726:4548755]
```
    for (i = 0; i < 52; i++)
```
[30.43428]
[5.4548755]
```
    for (int i = 0; i < 52; i++)
```
Replacement in crawl-ref/source/abl-show.cc at line 2369 [5.4494389]
B:BD[44.973] → [30.43556:43600]
```
    for (i = 0; i < MAX_GOD_ABILITIES; ++i)
```
[44.973]
[5.4549325]
```
    for (int i = 0; i < MAX_GOD_ABILITIES; ++i)
```

Code cleanups, mainly in clouds.

Dependencies

In channels

Change contents

Deletion in crawl-ref/source/view.h at line 66 [5.13254]

Deletion in crawl-ref/source/view.h at line 67 [5.13254]

Deletion in crawl-ref/source/view.h at line 69 [5.13254]

Deletion in crawl-ref/source/view.h at line 74 [5.13254]

Deletion in crawl-ref/source/view.h at line 83 [5.13254]

Deletion in crawl-ref/source/view.h at line 88 [5.13254]

Deletion in crawl-ref/source/view.h at line 89 [5.13254]

Deletion in crawl-ref/source/view.h at line 90 [5.13254]

Deletion in crawl-ref/source/view.h at line 91 [5.13254]

Deletion in crawl-ref/source/view.h at line 92 [5.13254]

Deletion in crawl-ref/source/view.h at line 93 [5.13254]

Deletion in crawl-ref/source/view.h at line 94 [5.13254]

Replacement in crawl-ref/source/view.cc at line 5183 [5.16817]

Replacement in crawl-ref/source/view.cc at line 5188 [5.16817]

Replacement in crawl-ref/source/tutorial.h at line 47 [17.3315]

Insertion in crawl-ref/source/tutorial.h at line 52 [17.3315]

Insertion in crawl-ref/source/tutorial.h at line 64 [17.3315]

Insertion in crawl-ref/source/tutorial.cc at line 3953 [17.5936]

Replacement in crawl-ref/source/cloud.cc at line 30 [5.4095717]

Replacement in crawl-ref/source/cloud.cc at line 33 [5.4095717]

Replacement in crawl-ref/source/cloud.cc at line 69 [5.4095717]

Replacement in crawl-ref/source/cloud.cc at line 72 [5.4095717]

Replacement in crawl-ref/source/cloud.cc at line 134 [5.4095717]

Insertion in crawl-ref/source/cloud.cc at line 136 [5.4095717]

Replacement in crawl-ref/source/cloud.cc at line 148 [5.4095717]

Replacement in crawl-ref/source/cloud.cc at line 151 [5.4095717]

Replacement in crawl-ref/source/cloud.cc at line 153 [5.4095717]

Replacement in crawl-ref/source/cloud.cc at line 155 [5.4095717]

Replacement in crawl-ref/source/cloud.cc at line 160 [5.4095717]

Replacement in crawl-ref/source/cloud.cc at line 162 [5.4095717]

Replacement in crawl-ref/source/cloud.cc at line 166 [5.4095717]

Deletion in crawl-ref/source/cloud.cc at line 168 [5.4095717]

Replacement in crawl-ref/source/cloud.cc at line 169 [5.4095717]

Replacement in crawl-ref/source/cloud.cc at line 171 [5.4095717]

Replacement in crawl-ref/source/cloud.cc at line 177 [5.4095717]

Replacement in crawl-ref/source/cloud.cc at line 180 [5.4095717]

Replacement in crawl-ref/source/cloud.cc at line 186 [5.4095717]

Replacement in crawl-ref/source/cloud.cc at line 239 [5.4095717]

Deletion in crawl-ref/source/cloud.cc at line 278 [5.4095717]

Replacement in crawl-ref/source/cloud.cc at line 280 [5.4095717]

Replacement in crawl-ref/source/cloud.cc at line 288 [5.4095717]

Replacement in crawl-ref/source/cloud.cc at line 292 [5.4095717]

Deletion in crawl-ref/source/cloud.cc at line 294 [5.4095717]

Replacement in crawl-ref/source/cloud.cc at line 296 [5.4095717]

Replacement in crawl-ref/source/cloud.cc at line 302 [5.4095717]

Replacement in crawl-ref/source/cloud.cc at line 306 [5.4095717]

Replacement in crawl-ref/source/cloud.cc at line 318 [5.4095717]

Insertion in crawl-ref/source/acr.cc at line 276 [5.4397395]

Deletion in crawl-ref/source/acr.cc at line 282 [5.4397395]

Insertion in crawl-ref/source/acr.cc at line 2494 [5.4397395]

Deletion in crawl-ref/source/acr.cc at line 2557 [5.4397395]

Deletion in crawl-ref/source/acr.cc at line 2558 [5.4397395]

Deletion in crawl-ref/source/acr.cc at line 2597 [5.4397395]

Replacement in crawl-ref/source/acr.cc at line 2598 [5.4397395]

Replacement in crawl-ref/source/acr.cc at line 2600 [5.4397395]

Deletion in crawl-ref/source/acr.cc at line 2602 [5.4397395]

Replacement in crawl-ref/source/abl-show.cc at line 2353 [5.4494389]

Deletion in crawl-ref/source/abl-show.cc at line 2356 [5.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 2360 [5.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 2369 [5.4494389]