fiddlerwoaroof/crawl - Change ATDAT2AONG2BDLZFBJZB4WVNRUFQAU7RDIVUBAZ6STAV62NX5R4AC

Moved some cloud related functions from misc.{cc,h} to cloud.{cc,h}

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

Created by zelgadis on June 8, 2008

ATDAT2AONG2BDLZFBJZB4WVNRUFQAU7RDIVUBAZ6STAV62NX5R4AC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/travel.cc at line 18 [7.39949]
[6.1498]
[7.40219]
```
#include "cloud.h"
```
Insertion in crawl-ref/source/player.cc at line 38 [9.962854]
[8.2535]
[7.197710]
```
#include "cloud.h"
```
Deletion in crawl-ref/source/misc.h at line 42 [9.1928926]
∅:D[10.8908] → [9.1930988:1930989]
∅:D[11.17615] → [9.1930988:1930989]
B:BD[9.1930988] → [9.1930988:1930989]
B:BD[9.1930989] → [3.2579:2663]
```
cloud_type beam2cloud(beam_type flavour);
beam_type cloud2beam(cloud_type flavour);
```

Deletion in crawl-ref/source/misc.h at line 43 [9.1928926]

∅:D[3.2664] → [9.1930989:1931218]

B:BD[9.1930989] → [9.1930989:1931218]

// last updated 12may2000 {dlb}
/* ***********************************************************************
 * called from: acr
 * *********************************************************************** */
void in_a_cloud(void);

Deletion in crawl-ref/source/misc.h at line 103 [9.1928926]
∅:D[5.2607] → [12.540634:540635]
∅:D[13.2644] → [12.540634:540635]
∅:D[14.5301] → [12.540634:540635]
B:BD[9.1933554] → [12.540634:540635]
∅:D[15.3031] → [16.188:229]
B:BD[12.540942] → [16.188:229]
```
std::string cloud_name(cloud_type type);
```
Deletion in crawl-ref/source/misc.h at line 104 [9.1928926]
∅:D[17.8825] → [18.3735:3795]
B:BD[16.229] → [18.3735:3795]
∅:D[18.3795] → [12.541007:541008]
∅:D[14.5950] → [12.541007:541008]
B:BD[12.541007] → [12.541007:541008]
```
bool is_damaging_cloud(cloud_type type, bool temp = false);
```

Deletion in crawl-ref/source/misc.cc at line 1309 [9.1933596]

∅:D[4.7013] → [9.1938291:1938292]

B:BD[9.1938291] → [9.1938291:1938292]

B:BD[9.1938292] → [3.2666:4338]

∅:D[3.4338] → [19.3227:3245]

∅:D[15.8853] → [19.3227:3245]

B:BD[9.1938292] → [19.3227:3245]

∅:D[19.3245] → [9.1938314:1938670]

B:BD[9.1938314] → [9.1938314:1938670]

B:BD[9.1938670] → [20.10393:10436]

∅:D[20.10436] → [9.1938724:1939485]

B:BD[9.1938724] → [9.1938724:1939485]

B:BD[9.1939485] → [12.544401:544449]

∅:D[12.544449] → [9.1939523:1939561]

B:BD[9.1939523] → [9.1939523:1939561]

B:BD[9.1939587] → [9.1939587:1939858]

B:BD[9.1939858] → [21.18619:18690]

∅:D[21.18690] → [9.1939930:1940177]

B:BD[9.1939930] → [9.1939930:1940177]

B:BD[9.1940202] → [9.1940202:1940607]

B:BD[9.1940607] → [2.85:153]

∅:D[2.153] → [9.1940718:1940986]

B:BD[9.1940718] → [9.1940718:1940986]

B:BD[9.1940986] → [12.544450:544498]

∅:D[12.544498] → [9.1941024:1941063]

B:BD[9.1941024] → [9.1941024:1941063]

B:BD[9.1941090] → [9.1941090:1941234]

B:BD[9.1941234] → [21.18691:18767]

∅:D[21.18767] → [9.1941311:1941510]

B:BD[9.1941311] → [9.1941311:1941510]

B:BD[9.1941635] → [9.1941635:1941727]

B:BD[9.1941727] → [22.602:608]

∅:D[22.608] → [9.1941753:1941816]

B:BD[9.1941753] → [9.1941753:1941816]

B:BD[9.1941816] → [12.544499:544535]

∅:D[7.248556] → [9.1942052:1942143]

∅:D[12.544535] → [9.1942052:1942143]

B:BD[9.1942052] → [9.1942052:1942143]

B:BD[9.1942143] → [22.609:741]

∅:D[22.741] → [9.1942143:1942144]

B:BD[9.1942143] → [9.1942143:1942144]

B:BD[9.1942144] → [22.742:983]

∅:D[22.983] → [9.1942247:1942272]

B:BD[9.1942247] → [9.1942247:1942272]

B:BD[9.1942272] → [23.7102:7194]

∅:D[23.7194] → [9.1942355:1942370]

B:BD[9.1942355] → [9.1942355:1942370]

B:BD[9.1942370] → [22.984:990]

∅:D[22.990] → [9.1942370:1942394]

B:BD[9.1942370] → [9.1942370:1942394]

B:BD[9.1942421] → [9.1942421:1942788]


cloud_type beam2cloud(beam_type flavour)
{
    switch (flavour)
    {
    default:
    case BEAM_NONE:
        return CLOUD_NONE;
    case BEAM_FIRE:
    case BEAM_POTION_FIRE:
        return CLOUD_FIRE;
    case BEAM_POTION_STINKING_CLOUD:
        return CLOUD_STINK;
    case BEAM_COLD:
    case BEAM_POTION_COLD:
        return CLOUD_COLD;
    case BEAM_POISON:
    case BEAM_POTION_POISON:
        return CLOUD_POISON;
    case BEAM_POTION_BLACK_SMOKE:
        return CLOUD_BLACK_SMOKE;
    case BEAM_POTION_GREY_SMOKE:
        return CLOUD_GREY_SMOKE;
    case BEAM_POTION_BLUE_SMOKE:
        return CLOUD_BLUE_SMOKE;
    case BEAM_POTION_PURP_SMOKE:
        return CLOUD_PURP_SMOKE;
    case BEAM_STEAM:
    case BEAM_POTION_STEAM:
        return CLOUD_STEAM;
    case BEAM_MIASMA:
    case BEAM_POTION_MIASMA:
        return CLOUD_MIASMA;
    case BEAM_RANDOM:
        return CLOUD_RANDOM;
    }
}
beam_type cloud2beam(cloud_type flavour)
{
    switch (flavour)
    {
    default:
    case CLOUD_NONE:
        return BEAM_NONE;
    case CLOUD_FIRE:
        return BEAM_FIRE;
    case CLOUD_STINK:
        return BEAM_POTION_STINKING_CLOUD;
    case CLOUD_COLD:
        return BEAM_COLD;
    case CLOUD_POISON:
        return BEAM_POISON;
    case CLOUD_BLACK_SMOKE:
        return BEAM_POTION_BLACK_SMOKE;
    case CLOUD_GREY_SMOKE:
        return BEAM_POTION_GREY_SMOKE;
    case CLOUD_BLUE_SMOKE:
        return BEAM_POTION_BLUE_SMOKE;
    case CLOUD_PURP_SMOKE:
        return BEAM_POTION_PURP_SMOKE;
    case CLOUD_STEAM:
        return BEAM_STEAM;
    case CLOUD_MIASMA:
        return BEAM_MIASMA;
    case CLOUD_RANDOM:
        return BEAM_RANDOM;
    }
}
void in_a_cloud()
{
    int cl = env.cgrid[you.x_pos][you.y_pos];
    int hurted = 0;
    int resist;
    if (you.duration[DUR_CONDENSATION_SHIELD] > 0)
    {
        mpr("Your icy shield dissipates!", MSGCH_DURATION);
        you.duration[DUR_CONDENSATION_SHIELD] = 0;
        you.redraw_armour_class = 1;
    }
    switch (env.cloud[cl].type)
    {
    case CLOUD_FIRE:
        if (you.duration[DUR_FIRE_SHIELD])
            return;
        mpr("You are engulfed in roaring flames!");
        resist = player_res_fire();
        if (resist <= 0)
        {
            hurted += ((random2avg(23, 3) + 10) * you.time_taken) / 10;
            if (resist < 0)
                hurted += ((random2avg(14, 2) + 3) * you.time_taken) / 10;
            hurted -= random2(player_AC());
            if (hurted < 1)
                hurted = 0;
            else
                ouch( hurted, cl, KILLED_BY_CLOUD, "flame" );
        }
        else
        {
            canned_msg(MSG_YOU_RESIST);
            hurted += ((random2avg(23, 3) + 10) * you.time_taken) / 10;
            hurted /= (1 + resist * resist);
            ouch( hurted, cl, KILLED_BY_CLOUD, "flame" );
        }
        expose_player_to_element(BEAM_FIRE, 7);
        break;
    case CLOUD_STINK:
        // If you don't have to breathe, unaffected
        mpr("You are engulfed in noxious fumes!");
        if (player_res_poison())
            break;
        hurted += (random2(3) * you.time_taken) / 10;
        if (hurted < 1)
            hurted = 0;
        else
            ouch( (hurted * you.time_taken) / 10, cl, KILLED_BY_CLOUD,
                    "noxious fumes" );
        if (1 + random2(27) >= you.experience_level)
        {
            mpr("You choke on the stench!");
            confuse_player( (coinflip() ? 3 : 2) );
        }
        break;
    case CLOUD_COLD:
        mpr("You are engulfed in freezing vapours!");
        resist = player_res_cold();
        if (resist <= 0)
        {
            hurted += ((random2avg(23, 3) + 10) * you.time_taken) / 10;
            if (resist < 0)
                hurted += ((random2avg(14, 2) + 3) * you.time_taken) / 10;
            hurted -= random2(player_AC());
            if (hurted < 0)
                hurted = 0;
            ouch( hurted, cl, KILLED_BY_CLOUD, "freezing vapour" );
        }
        else
        {
            canned_msg(MSG_YOU_RESIST);
            hurted += ((random2avg(23, 3) + 10) * you.time_taken) / 10;
            hurted /= (1 + resist * resist);
            ouch( hurted, cl, KILLED_BY_CLOUD, "freezing vapour" );
        }
        expose_player_to_element(BEAM_COLD, 7);
        break;
    case CLOUD_POISON:
        // If you don't have to breathe, unaffected
        mpr("You are engulfed in poison gas!");
        if (!player_res_poison())
        {
            ouch( (random2(10) * you.time_taken) / 10, cl, KILLED_BY_CLOUD,
                  "poison gas" );
            poison_player(1);
        }
        break;
    case CLOUD_GREY_SMOKE:
    case CLOUD_BLUE_SMOKE:
    case CLOUD_PURP_SMOKE:
    case CLOUD_BLACK_SMOKE:
        mpr("You are engulfed in a cloud of smoke!");
        break;
    case CLOUD_STEAM:
    {
        mpr("You are engulfed in a cloud of scalding steam!");
        if (player_res_steam() > 0)
        {
            mpr("It doesn't seem to affect you.");
            return;
        }
        const int base_dam = steam_cloud_damage(env.cloud[cl]);
        hurted += (random2avg(base_dam, 2) * you.time_taken) / 10;
        const int res_fire = player_res_fire();
        if (res_fire < 0)
            hurted += (random2(base_dam / 2 + 1) * you.time_taken) / 10;
        else if (res_fire)
            hurted /= 1 + (res_fire / 2);
        if (hurted < 0)
            hurted = 0;
        ouch( (hurted * you.time_taken) / 10, cl, KILLED_BY_CLOUD,
              "steam" );
        break;
    }
    case CLOUD_MIASMA:
        mpr("You are engulfed in a dark miasma.");
        if (player_prot_life() > random2(3))
            return;
        poison_player(1);
        hurted += (random2avg(12, 3) * you.time_taken) / 10;    // 3
        if (hurted < 0)
            hurted = 0;
        ouch( hurted, cl, KILLED_BY_CLOUD, "foul pestilence" );
        potion_effect(POT_SLOWING, 5);

Deletion in crawl-ref/source/misc.cc at line 1310 [9.1933596]
B:BD[9.1942789] → [9.1942789:1942855]
B:BD[9.1942855] → [19.3246:3274]
∅:D[19.3274] → [9.1942855:1942941]
B:BD[9.1942855] → [9.1942855:1942941]
B:BD[9.1942941] → [12.544536:544537]
```
        if (you.hp_max > 4 && coinflip())
            rot_hp(1);
        break;
    default:
        break;
    }
    return;
}                               // end in_a_cloud()
```

Deletion in crawl-ref/source/misc.cc at line 2325 [9.1933596]

B:BD[24.20387] → [18.3797:3848]

∅:D[18.3848] → [16.314:340]

B:BD[16.314] → [16.314:340]

B:BD[16.340] → [25.5762:5784]

∅:D[25.5784] → [16.340:361]

B:BD[16.340] → [16.340:361]

B:BD[16.434] → [16.434:455]

B:BD[16.455] → [25.5785:5808]

B:BD[25.5808] → [4.7727:7728]

∅:D[4.7728] → [26.17637:17711]

B:BD[25.5808] → [26.17637:17711]

∅:D[26.17711] → [25.5881:6044]

B:BD[25.5881] → [25.5881:6044]

∅:D[25.6044] → [16.480:503]

B:BD[16.480] → [16.480:503]

B:BD[16.503] → [18.3849:3899]

∅:D[18.3899] → [16.530:552]

∅:D[25.6096] → [16.530:552]

B:BD[16.530] → [16.530:552]

B:BD[16.552] → [18.3900:3953]

∅:D[18.3953] → [16.578:601]

∅:D[25.6151] → [16.578:601]

B:BD[16.578] → [16.578:601]

B:BD[16.601] → [18.3954:4007]

B:BD[18.4007] → [4.7729:7730]

∅:D[25.6234] → [16.651:664]

∅:D[4.7730] → [16.651:664]

B:BD[16.651] → [16.651:664]

B:BD[16.664] → [4.7731:7764]

∅:D[4.7764] → [16.664:696]

B:BD[16.664] → [16.664:696]

∅:D[16.696] → [12.547766:547767]

B:BD[9.1984809] → [12.547766:547767]

B:BD[12.547767] → [16.697:784]

B:BD[16.809] → [16.809:855]

B:BD[16.881] → [16.881:934]

B:BD[16.959] → [16.959:1016]

B:BD[16.1043] → [16.1043:1101]

B:BD[16.1132] → [16.1132:1188]

B:BD[16.1219] → [16.1219:1275]

B:BD[16.1306] → [16.1306:1359]

B:BD[16.1385] → [16.1385:1432]

B:BD[16.1459] → [16.1459:1521]

B:BD[16.1553] → [16.1553:1687]

bool is_damaging_cloud(cloud_type type, bool temp)
{
    switch (type)
    {
    // always harmful
    case CLOUD_FIRE:
    case CLOUD_COLD:
        return (true);
    // Only harmful if the player doesn't have the necessary resistances.
    // Takes into account what the player can *know* and what s/he can
    // also expect to be the case a few turns later (ignores spells).
    case CLOUD_STINK:
    case CLOUD_POISON:
        return (!player_res_poison(false, temp));
    case CLOUD_STEAM:
        return (player_res_steam(false, temp) <= 0);
    case CLOUD_MIASMA:
        return (player_prot_life(false, temp) <= 2);
    default:
        // Smoke, never harmful.
        return (false);
    }
}
std::string cloud_name(cloud_type type)
{
    switch (type)
    {
    case CLOUD_FIRE:
        return "flame";
    case CLOUD_STINK:
        return "noxious fumes";
    case CLOUD_COLD:
        return "freezing vapour";
    case CLOUD_POISON:
        return "poison gases";
    case CLOUD_GREY_SMOKE:
        return "grey smoke";
    case CLOUD_BLUE_SMOKE:
        return "blue smoke";
    case CLOUD_PURP_SMOKE:
        return "purple smoke";
    case CLOUD_STEAM:
        return "steam";
    case CLOUD_MIASMA:
        return "foul pestilence";
    case CLOUD_BLACK_SMOKE:
        return "black smoke";
    case CLOUD_MIST:
        return "thin mist";
    default:
        return "buggy goodness";
    }
}

Insertion in crawl-ref/source/directn.cc at line 37 [9.3697945]
[6.9480]
[27.182]
```
#include "cloud.h"
```
Insertion in crawl-ref/source/directn.cc at line 45 [9.3697945]
[28.98776]
[28.98776]
```
#include "menu.h"
```
Deletion in crawl-ref/source/directn.cc at line 47 [9.3697945]
B:BD[28.98794] → [29.1286:1304]
```
#include "menu.h"
```

Insertion in crawl-ref/source/cloud.h at line 53 [9.4095213]

[30.3321]

[31.2172]

cloud_type beam2cloud(beam_type flavour);
beam_type cloud2beam(cloud_type flavour);
void in_a_cloud(void);
std::string cloud_name(cloud_type type);
bool is_damaging_cloud(cloud_type type, bool temp = false);

Insertion in crawl-ref/source/cloud.cc at line 23 [9.4095717]
[9.4096041]
[31.2303]
```
#include "it_use2.h"
```
Deletion in crawl-ref/source/cloud.cc at line 25 [9.4095717]
B:BD[31.2324] → [31.2324:2342]
```
#include "misc.h"
```
Insertion in crawl-ref/source/cloud.cc at line 27 [9.4095717]
[32.8642]
[9.4096041]
```
#include "player.h"
```

Insertion in crawl-ref/source/cloud.cc at line 324 [9.4095717]

[19.7752]

[31.2343]

}
cloud_type beam2cloud(beam_type flavour)
{
    switch (flavour)
    {
    default:
    case BEAM_NONE:
        return CLOUD_NONE;
    case BEAM_FIRE:
    case BEAM_POTION_FIRE:
        return CLOUD_FIRE;
    case BEAM_POTION_STINKING_CLOUD:
        return CLOUD_STINK;
    case BEAM_COLD:
    case BEAM_POTION_COLD:
        return CLOUD_COLD;
    case BEAM_POISON:
    case BEAM_POTION_POISON:
        return CLOUD_POISON;
    case BEAM_POTION_BLACK_SMOKE:
        return CLOUD_BLACK_SMOKE;
    case BEAM_POTION_GREY_SMOKE:
        return CLOUD_GREY_SMOKE;
    case BEAM_POTION_BLUE_SMOKE:
        return CLOUD_BLUE_SMOKE;
    case BEAM_POTION_PURP_SMOKE:
        return CLOUD_PURP_SMOKE;
    case BEAM_STEAM:
    case BEAM_POTION_STEAM:
        return CLOUD_STEAM;
    case BEAM_MIASMA:
    case BEAM_POTION_MIASMA:
        return CLOUD_MIASMA;
    case BEAM_RANDOM:
        return CLOUD_RANDOM;
    }
}
beam_type cloud2beam(cloud_type flavour)
{
    switch (flavour)
    {
    default:
    case CLOUD_NONE:
        return BEAM_NONE;
    case CLOUD_FIRE:
        return BEAM_FIRE;
    case CLOUD_STINK:
        return BEAM_POTION_STINKING_CLOUD;
    case CLOUD_COLD:
        return BEAM_COLD;
    case CLOUD_POISON:
        return BEAM_POISON;
    case CLOUD_BLACK_SMOKE:
        return BEAM_POTION_BLACK_SMOKE;
    case CLOUD_GREY_SMOKE:
        return BEAM_POTION_GREY_SMOKE;
    case CLOUD_BLUE_SMOKE:
        return BEAM_POTION_BLUE_SMOKE;
    case CLOUD_PURP_SMOKE:
        return BEAM_POTION_PURP_SMOKE;
    case CLOUD_STEAM:
        return BEAM_STEAM;
    case CLOUD_MIASMA:
        return BEAM_MIASMA;
    case CLOUD_RANDOM:
        return BEAM_RANDOM;
    }
}
void in_a_cloud()
{
    int cl = env.cgrid[you.x_pos][you.y_pos];
    int hurted = 0;
    int resist;
    if (you.duration[DUR_CONDENSATION_SHIELD] > 0)
    {
        mpr("Your icy shield dissipates!", MSGCH_DURATION);
        you.duration[DUR_CONDENSATION_SHIELD] = 0;
        you.redraw_armour_class = 1;
    }
    switch (env.cloud[cl].type)
    {
    case CLOUD_FIRE:
        if (you.duration[DUR_FIRE_SHIELD])
            return;
        mpr("You are engulfed in roaring flames!");
        resist = player_res_fire();
        if (resist <= 0)
        {
            hurted += ((random2avg(23, 3) + 10) * you.time_taken) / 10;
            if (resist < 0)
                hurted += ((random2avg(14, 2) + 3) * you.time_taken) / 10;
            hurted -= random2(player_AC());
            if (hurted < 1)
                hurted = 0;
            else
                ouch( hurted, cl, KILLED_BY_CLOUD, "flame" );
        }
        else
        {
            canned_msg(MSG_YOU_RESIST);
            hurted += ((random2avg(23, 3) + 10) * you.time_taken) / 10;
            hurted /= (1 + resist * resist);
            ouch( hurted, cl, KILLED_BY_CLOUD, "flame" );
        }
        expose_player_to_element(BEAM_FIRE, 7);
        break;
    case CLOUD_STINK:
        // If you don't have to breathe, unaffected
        mpr("You are engulfed in noxious fumes!");
        if (player_res_poison())
            break;
        hurted += (random2(3) * you.time_taken) / 10;
        if (hurted < 1)
            hurted = 0;
        else
            ouch( (hurted * you.time_taken) / 10, cl, KILLED_BY_CLOUD,
                    "noxious fumes" );
        if (1 + random2(27) >= you.experience_level)
        {
            mpr("You choke on the stench!");
            confuse_player( (coinflip() ? 3 : 2) );
        }
        break;
    case CLOUD_COLD:
        mpr("You are engulfed in freezing vapours!");
        resist = player_res_cold();
        if (resist <= 0)
        {
            hurted += ((random2avg(23, 3) + 10) * you.time_taken) / 10;
            if (resist < 0)
                hurted += ((random2avg(14, 2) + 3) * you.time_taken) / 10;
            hurted -= random2(player_AC());
            if (hurted < 0)
                hurted = 0;
            ouch( hurted, cl, KILLED_BY_CLOUD, "freezing vapour" );
        }
        else
        {
            canned_msg(MSG_YOU_RESIST);
            hurted += ((random2avg(23, 3) + 10) * you.time_taken) / 10;
            hurted /= (1 + resist * resist);
            ouch( hurted, cl, KILLED_BY_CLOUD, "freezing vapour" );
        }
        expose_player_to_element(BEAM_COLD, 7);
        break;
    case CLOUD_POISON:
        // If you don't have to breathe, unaffected
        mpr("You are engulfed in poison gas!");
        if (!player_res_poison())
        {
            ouch( (random2(10) * you.time_taken) / 10, cl, KILLED_BY_CLOUD,
                  "poison gas" );
            poison_player(1);
        }
        break;
    case CLOUD_GREY_SMOKE:
    case CLOUD_BLUE_SMOKE:
    case CLOUD_PURP_SMOKE:
    case CLOUD_BLACK_SMOKE:
        mpr("You are engulfed in a cloud of smoke!");
        break;
    case CLOUD_STEAM:
    {
        mpr("You are engulfed in a cloud of scalding steam!");
        if (player_res_steam() > 0)
        {
            mpr("It doesn't seem to affect you.");
            return;
        }
        const int base_dam = steam_cloud_damage(env.cloud[cl]);
        hurted += (random2avg(base_dam, 2) * you.time_taken) / 10;
        const int res_fire = player_res_fire();
        if (res_fire < 0)
            hurted += (random2(base_dam / 2 + 1) * you.time_taken) / 10;
        else if (res_fire)
            hurted /= 1 + (res_fire / 2);
        if (hurted < 0)
            hurted = 0;
        ouch( (hurted * you.time_taken) / 10, cl, KILLED_BY_CLOUD,
              "steam" );
        break;
    }
    case CLOUD_MIASMA:
        mpr("You are engulfed in a dark miasma.");
        if (player_prot_life() > random2(3))
            return;
        poison_player(1);
        hurted += (random2avg(12, 3) * you.time_taken) / 10;    // 3
        if (hurted < 0)
            hurted = 0;
        ouch( hurted, cl, KILLED_BY_CLOUD, "foul pestilence" );
        potion_effect(POT_SLOWING, 5);
        if (you.hp_max > 4 && coinflip())
            rot_hp(1);
        break;
    default:
        break;
    }
    return;
}                               // end in_a_cloud()
bool is_damaging_cloud(cloud_type type, bool temp)
{
    switch (type)
    {
    // always harmful
    case CLOUD_FIRE:
    case CLOUD_COLD:
        return (true);
    // Only harmful if the player doesn't have the necessary resistances.
    // Takes into account what the player can *know* and what s/he can
    // also expect to be the case a few turns later (ignores spells).
    case CLOUD_STINK:
    case CLOUD_POISON:
        return (!player_res_poison(false, temp));
    case CLOUD_STEAM:
        return (player_res_steam(false, temp) <= 0);
    case CLOUD_MIASMA:
        return (player_prot_life(false, temp) <= 2);
    default:
        // Smoke, never harmful.
        return (false);
    }
}
std::string cloud_name(cloud_type type)
{
    switch (type)
    {
    case CLOUD_FIRE:
        return "flame";
    case CLOUD_STINK:
        return "noxious fumes";
    case CLOUD_COLD:
        return "freezing vapour";
    case CLOUD_POISON:
        return "poison gases";
    case CLOUD_GREY_SMOKE:
        return "grey smoke";
    case CLOUD_BLUE_SMOKE:
        return "blue smoke";
    case CLOUD_PURP_SMOKE:
        return "purple smoke";
    case CLOUD_STEAM:
        return "steam";
    case CLOUD_MIASMA:
        return "foul pestilence";
    case CLOUD_BLACK_SMOKE:
        return "black smoke";
    case CLOUD_MIST:
        return "thin mist";
    default:
        return "buggy goodness";
    }

Insertion in crawl-ref/source/cloud.cc at line 617 [9.4095717]

[31.2345]


////////////////////////////////////////////////////////////////////////
// cloud_struct

Insertion in crawl-ref/source/cloud.cc at line 621 [9.4095717]

[31.2346]

killer_type cloud_struct::beam_thrower() const
{
    return (whose == KC_YOU ? KILL_YOU_MISSILE : KILL_MON_MISSILE);
}
//////////////////////////////////////////////////////////////////////////
// Fog machine stuff

Deletion in crawl-ref/source/cloud.cc at line 821 [9.4095717]
∅:D[31.3225] → [33.913:1052]
∅:D[32.12523] → [33.913:1052]
B:BD[33.913] → [33.913:1052]
B:BD[33.1052] → [3.4772:4840]
∅:D[33.1119] → [34.672:674]
∅:D[3.4840] → [34.672:674]
∅:D[19.7752] → [34.672:674]
B:BD[34.672] → [34.672:674]
```
////////////////////////////////////////////////////////////////////////
// cloud_struct
killer_type cloud_struct::beam_thrower() const
{
    return (whose == KC_YOU ? KILL_YOU_MISSILE : KILL_MON_MISSILE);
}
```

Moved some cloud related functions from misc.{cc,h} to cloud.{cc,h}

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/travel.cc at line 18 [7.39949]

Insertion in crawl-ref/source/player.cc at line 38 [9.962854]

Deletion in crawl-ref/source/misc.h at line 42 [9.1928926]

Deletion in crawl-ref/source/misc.h at line 43 [9.1928926]

Deletion in crawl-ref/source/misc.h at line 103 [9.1928926]

Deletion in crawl-ref/source/misc.h at line 104 [9.1928926]

Deletion in crawl-ref/source/misc.cc at line 1309 [9.1933596]

Deletion in crawl-ref/source/misc.cc at line 1310 [9.1933596]

Deletion in crawl-ref/source/misc.cc at line 2325 [9.1933596]

Insertion in crawl-ref/source/directn.cc at line 37 [9.3697945]

Insertion in crawl-ref/source/directn.cc at line 45 [9.3697945]

Deletion in crawl-ref/source/directn.cc at line 47 [9.3697945]

Insertion in crawl-ref/source/cloud.h at line 53 [9.4095213]

Insertion in crawl-ref/source/cloud.cc at line 23 [9.4095717]

Deletion in crawl-ref/source/cloud.cc at line 25 [9.4095717]

Insertion in crawl-ref/source/cloud.cc at line 27 [9.4095717]

Insertion in crawl-ref/source/cloud.cc at line 324 [9.4095717]

Insertion in crawl-ref/source/cloud.cc at line 617 [9.4095717]

Insertion in crawl-ref/source/cloud.cc at line 621 [9.4095717]

Deletion in crawl-ref/source/cloud.cc at line 821 [9.4095717]