fiddlerwoaroof/crawl - Change KZMLJTPHO2VSNRKKZ252S7F25KWFIH2WT4JR6GLUJROADBU7WLYAC

Fix warning.

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

Created by haranp on February 15, 2009

KZMLJTPHO2VSNRKKZ252S7F25KWFIH2WT4JR6GLUJROADBU7WLYAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/view.cc at line 738 [14.16817]

B:BD[12.1274] → [13.818:880]

        if (grd(p) >= DNGN_MINMOVE && mgrd(p) == NON_MONSTER)

[12.1274]

[12.1380]

        const monsters *blocker = monster_at(p);
        const bool seen_blocker = blocker && you.can_see(blocker);
        if (grd(p) >= DNGN_MINMOVE && !seen_blocker)

Replacement in crawl-ref/source/view.cc at line 745 [14.16817]

B:BD[12.1515] → [15.391:451]

                monsters& mon = menv[you.mesmerised_by[i]];

[12.1515]

[12.1571]

                const monsters& mon = menv[you.mesmerised_by[i]];

Insertion in crawl-ref/source/view.cc at line 769 [14.16817]

[16.181]

[17.6]

        // FIXME: this uses the real igrd, which the player shouldn't
        // be aware of.

Replacement in crawl-ref/source/view.cc at line 905 [14.16817]

B:BD[18.827] → [18.827:954]

B:BD[18.954] → [7.7:53]

            int wpn = you.equip[EQ_WEAPON];
            if (wpn != -1
                && you.inv[wpn].base_type == OBJ_WEAPONS
                && is_evil_item(you.inv[wpn])

[18.827]

[18.1004]

            const item_def* wpn = you.weapon();
            if (wpn
                && wpn->base_type == OBJ_WEAPONS
                && is_evil_item(*wpn)

Replacement in crawl-ref/source/view.cc at line 967 [14.16817]

B:BD[19.71] → [6.40:125]

    if (mons_is_mimic(monster->type)
        && !mons_is_known_mimic(monster))
    {

[19.71]

[6.125]

    if (mons_is_mimic(monster->type) && !mons_is_known_mimic(monster))

Deletion in crawl-ref/source/view.cc at line 969 [14.16817]
B:BD[6.141] → [6.141:147]
```
    }
```

Replacement in crawl-ref/source/view.cc at line 1491 [14.16817]

B:BD[20.178] → [20.178:254]

    for (radius_iterator ri(c, LOS_RADIUS, true, false);
         ri; ++ri)

[20.178]

[21.3434]

    for (radius_iterator ri(c, LOS_RADIUS, true, false); ri; ++ri)

Replacement in crawl-ref/source/view.cc at line 1653 [14.16817]
B:BD[14.58041] → [14.58041:58072]
```
        if (monster->type < 0)
```
[14.58041]
[14.58072]
```
        if (!monster->alive())
```

Deletion in crawl-ref/source/stuff.cc at line 1298 [14.224557]

∅:D[22.572] → [23.107626:107822]

∅:D[9.698] → [23.107626:107822]

∅:D[24.1525] → [23.107626:107822]

B:BD[23.107626] → [23.107626:107822]

B:BD[23.107822] → [22.573:674]

∅:D[22.674] → [23.107903:107942]

∅:D[25.2859] → [23.107903:107942]

B:BD[23.107903] → [23.107903:107942]

B:BD[23.107942] → [22.675:811]

∅:D[22.811] → [14.241365:241366]

∅:D[23.108082] → [14.241365:241366]

B:BD[14.241365] → [14.241365:241366]

B:BD[14.241366] → [23.108083:108210]

B:BD[23.108210] → [25.2860:2962]

∅:D[25.2962] → [23.108295:108320]

B:BD[23.108295] → [23.108295:108320]

B:BD[23.108320] → [26.2857:2880]

B:BD[26.2880] → [21.17110:17164]

B:BD[21.17164] → [22.812:872]

∅:D[22.872] → [23.108461:108531]

∅:D[21.17223] → [23.108461:108531]

B:BD[23.108461] → [23.108461:108531]

}
// Returns a random location in (x_pos, y_pos)... the grid will be
// DNGN_FLOOR if clear, and NON_MONSTER if empty.  Exclusive tells
// if we're using in_bounds() or map_bounds() restriction.
void random_in_bounds(int &x_pos, int &y_pos, int terr,
                      bool empty, bool excl)
{
    bool done = false;
    do
    {
        x_pos = X_BOUND_1 + random2(X_WIDTH - 2 * excl) + 1 * excl;
        y_pos = Y_BOUND_1 + random2(Y_WIDTH - 2 * excl) + 1 * excl;
        if (terr == DNGN_RANDOM)
            done = true;
        else if (terr == grd[x_pos][y_pos])
            done = true;
        else if (terr == DNGN_DEEP_WATER
                 && grd[x_pos][y_pos] == DNGN_SHALLOW_WATER)
            done = true;
        else if (empty
                 && mgrd[x_pos][y_pos] != NON_MONSTER
                 && (coord_def(x_pos, y_pos) != you.pos()))
        {
            done = true;
        }
    }
    while (!done);

Replacement in crawl-ref/source/spl-cast.cc at line 1190 [14.293070]

B:BD[27.788] → [27.788:843]

                         mgrd(you.pos() + spd.delta)))

[27.788]

[27.843]

                         monster_at(you.pos() + spd.delta)))

Deletion in crawl-ref/source/spells2.h at line 17 [14.562867]

B:BD[14.563141] → [14.563141:563348]

// last updated 24may2000 {dlb}
/* ***********************************************************************
 * called from: spell
 * *********************************************************************** */

Replacement in crawl-ref/source/spells2.h at line 18 [14.562867]

∅:D[28.1308] → [14.564026:564235]

∅:D[29.1689] → [14.564026:564235]

B:BD[14.564026] → [14.564026:564235]

B:BD[14.564235] → [27.882:943]


// last updated 24may2000 {dlb}
/* ***********************************************************************
 * called from: spell
 * *********************************************************************** */
bool burn_freeze(int pow, beam_type flavour, int targetmon);

[30.258]

[14.564272]

bool burn_freeze(int pow, beam_type flavour, monsters *monster);

Replacement in crawl-ref/source/spells2.cc at line 823 [14.569242]

B:BD[14.596086] → [3.273:333]

bool burn_freeze(int pow, beam_type flavour, int targetmon)

[14.596086]

[14.596191]

bool burn_freeze(int pow, beam_type flavour, monsters *monster)

Replacement in crawl-ref/source/spells2.cc at line 827 [14.569242]
B:BD[14.596335] → [27.1007:1041]
```
    if (targetmon == NON_MONSTER)
```
[14.596335]
[14.596366]
```
    if (monster == NULL)
```

Replacement in crawl-ref/source/spells2.cc at line 831 [14.569242]

B:BD[27.1109] → [27.1109:1260]

        // order to prevent locating invisible monsters, unless
        // you know that you see invisible.
        return (!player_see_invis(false));

[27.1109]

[14.596968]

        // order to prevent locating invisible monsters.
        return (true);

Deletion in crawl-ref/source/spells2.cc at line 835 [14.569242]
B:BD[14.596975] → [27.1261:1303]
∅:D[31.1203] → [14.597509:597510]
∅:D[27.1303] → [14.597509:597510]
B:BD[14.597509] → [14.597509:597510]
```
    monsters *monster = &menv[targetmon];
```
Replacement in crawl-ref/source/spells2.cc at line 1176 [14.569242]
B:BD[32.3421] → [32.3421:3464]
B:BD[32.3464] → [4.504:578]
∅:D[4.578] → [32.3521:3522]
B:BD[32.3521] → [32.3521:3522]
```
    monster_type mon = MONS_PROGRAM_BUG;
    const int dur = !permanent ? std::min(2 + (random2(pow) / 4), 6) : 0;
```
[32.3421]
[32.3522]
```
    const int dur = permanent ? 0 : std::min(2 + (random2(pow) / 4), 6);
```

Replacement in crawl-ref/source/spells2.cc at line 1182 [14.569242]

B:BD[32.3700] → [32.3700:3755]

B:BD[32.3755] → [33.18596:18676]

∅:D[33.18676] → [32.3819:3874]

B:BD[32.3819] → [32.3819:3874]

B:BD[32.3874] → [33.18677:18775]

∅:D[32.4043] → [34.345:346]

∅:D[33.18775] → [34.345:346]

B:BD[35.1817] → [34.345:346]

B:BD[34.346] → [33.18776:18846]

∅:D[33.18846] → [32.4114:4217]

B:BD[32.4114] → [32.4114:4217]

B:BD[32.4217] → [33.18847:18863]

∅:D[33.18863] → [32.4288:4407]

B:BD[32.4288] → [32.4288:4407]

B:BD[32.4407] → [33.18864:18958]

∅:D[33.18958] → [32.4507:4527]

B:BD[32.4507] → [32.4507:4527]

B:BD[32.4527] → [33.18959:19019]

∅:D[33.19019] → [32.4587:4645]

B:BD[32.4587] → [32.4587:4645]

B:BD[32.4645] → [33.19020:19157]

∅:D[33.19157] → [32.4782:4783]

B:BD[32.4782] → [32.4782:4783]

B:BD[32.4783] → [33.19158:19271]

∅:D[33.19271] → [32.5049:5365]

B:BD[32.5049] → [32.5049:5365]

        switch (random2(14))
        {
        case 0:
        case 1:
        case 2:         // prototypical swarming creature {dlb}
            mon = MONS_KILLER_BEE;
            break;
        case 3:
            mon = MONS_SCORPION; // think: "The Arrival" {dlb}
            break;
        case 4:         //jmf: technically not insects but still cool
            mon = MONS_WORM;
            break;              // but worms kinda "swarm" so s'ok {dlb}
        case 5:
            mon = MONS_GIANT_MOSQUITO;
            break;              // changed into giant mosquito 12jan2000 {dlb}
        case 6:
            mon = MONS_GIANT_BEETLE;   // think: scarabs in "The Mummy" {dlb}
            break;
        case 7:         //jmf: blowfly instead of queen bee
            mon = MONS_GIANT_BLOWFLY;
            break;
            // Queen bee added if more than x bees in swarm? {dlb}
            // The above would require code rewrite - worth it? {dlb}
        case 8:
            mon = MONS_WOLF_SPIDER;  // think: "Kingdom of the Spiders" {dlb}
            break;
        case 9:
            mon = MONS_BUTTERFLY;      // comic relief? {dlb}
            break;
        case 10:                // change into some kind of snake -- {dlb}
            mon = MONS_YELLOW_WASP;    // do wasps swarm? {dlb}
            break;              // think: "Indiana Jones" and snakepit? {dlb}

[32.3700]

[32.5365]

        const monster_type swarmers[] = {
            MONS_KILLER_BEE,   MONS_KILLER_BEE,    MONS_KILLER_BEE,
            MONS_SCORPION,     MONS_WORM,          MONS_GIANT_MOSQUITO,
            MONS_GIANT_BEETLE, MONS_GIANT_BLOWFLY, MONS_WOLF_SPIDER,
            MONS_BUTTERFLY,    MONS_YELLOW_WASP,   MONS_GIANT_ANT,
            MONS_GIANT_ANT,    MONS_GIANT_ANT
        };
        
        const monster_type mon = RANDOM_ELEMENT(swarmers);
        const bool friendly = force_hostile ? false : (random2(pow) > 7);

Deletion in crawl-ref/source/spells2.cc at line 1193 [14.569242]
B:BD[32.5366] → [32.5366:5486]
B:BD[32.5486] → [33.19272:19282]
∅:D[33.19282] → [32.5532:5533]
B:BD[32.5532] → [32.5532:5533]
B:BD[32.5533] → [5.275:344]
∅:D[5.344] → [32.5642:5643]
∅:D[36.435] → [32.5642:5643]
B:BD[32.5642] → [32.5642:5643]
```
        default:                // 3 in 14 chance, 12jan2000 {dlb}
            mon = MONS_GIANT_ANT;
            break;
        }
        bool friendly = !force_hostile ? (random2(pow) > 7) : false;
```
Replacement in crawl-ref/source/makeitem.cc at line 2880 [38.927]
∅:D[2.2614] → [37.57259:57284]
B:BD[37.57259] → [37.57259:57284]
```
    item_colour( item );
```
[2.2614]
[38.97936]
```
    item_colour(item);
```
Replacement in crawl-ref/source/makeitem.cc at line 2883 [38.927]
B:BD[39.315] → [39.315:348]
```
    item_set_appearance( item );
```
[39.315]
[39.348]
```
    item_set_appearance(item);
```

Replacement in crawl-ref/source/makeitem.cc at line 2892 [38.927]

B:BD[38.98122] → [37.57356:57382]

∅:D[37.57382] → [38.98122:98158]

B:BD[38.98122] → [38.98122:98158]

        int x_pos, y_pos;
        int tries = 500;
        do

[38.98122]

[38.98158]

        coord_def itempos;
        bool found = false;
        for (int i = 0; i < 500 && !found; ++i)
        {
            itempos = random_in_bounds();
            found = (grd(itempos) == DNGN_FLOOR
                     && unforbidden(itempos, mapmask));
        }
        if (!found)

Replacement in crawl-ref/source/makeitem.cc at line 2902 [38.927]

B:BD[38.98168] → [38.98168:98294]

B:BD[38.98294] → [40.5582:5583]

∅:D[40.5583] → [38.98307:98375]

B:BD[38.98307] → [38.98307:98375]

            if (tries-- <= 0)
            {
                destroy_item(p);
                return (NON_ITEM);
            }
            x_pos = random2(GXM);
            y_pos = random2(GYM);

[38.98168]

[38.98375]

            // Couldn't find a single good spot!
            destroy_item(p);
            return (NON_ITEM);

Replacement in crawl-ref/source/makeitem.cc at line 2906 [38.927]
B:BD[38.98385] → [38.98385:98432]
B:BD[38.98432] → [41.782:849]
∅:D[41.849] → [38.98501:98502]
B:BD[38.98501] → [38.98501:98502]
B:BD[38.98502] → [42.39659:39717]
```
        while (grd[x_pos][y_pos] != DNGN_FLOOR
               || !unforbidden(coord_def(x_pos, y_pos), mapmask));
        move_item_to_grid( &p, coord_def(x_pos, y_pos) );
```
[38.98385]
[38.98549]
```
        move_item_to_grid(&p, itempos);
```
Deletion in crawl-ref/source/makeitem.cc at line 3048 [38.927]
B:BD[38.102304] → [38.102304:102325]
```
    //mv - give wand
```

Replacement in crawl-ref/source/makeitem.cc at line 3050 [38.927]

B:BD[38.102388] → [38.102388:102483]

        const int thing_created =
            items(0, OBJ_WANDS, OBJ_RANDOM, true, level, 0);

[38.102388]

[8.3058]

        const int idx = items(0, OBJ_WANDS, OBJ_RANDOM, true, level, 0);

Replacement in crawl-ref/source/makeitem.cc at line 3052 [38.927]
∅:D[8.3059] → [38.102483:102522]
B:BD[38.102483] → [38.102483:102522]
```
        if (thing_created == NON_ITEM)
```
[8.3059]
[38.102522]
```
        if (idx == NON_ITEM)
```
Insertion in crawl-ref/source/makeitem.cc at line 3054 [38.927]
[38.102542]
[38.102542]
```
        item_def& wand = mitm[idx];
```

Replacement in crawl-ref/source/makeitem.cc at line 3062 [38.927]

∅:D[8.3098] → [43.20619:20678]

B:BD[38.102740] → [43.20619:20678]

∅:D[43.20678] → [38.102801:102860]

B:BD[38.102801] → [38.102801:102860]

B:BD[38.102860] → [43.20679:20738]

∅:D[43.20738] → [38.102921:102980]

B:BD[38.102921] → [38.102921:102980]

B:BD[38.102980] → [43.20739:20803]

∅:D[43.20803] → [44.14699:14873]

B:BD[38.103046] → [44.14699:14873]

            if (mitm[thing_created].sub_type == WAND_FIRE)
                mitm[thing_created].sub_type = WAND_FLAME;
            if (mitm[thing_created].sub_type == WAND_COLD)
                mitm[thing_created].sub_type = WAND_FROST;
            if (mitm[thing_created].sub_type == WAND_LIGHTNING)
            {
                mitm[thing_created].sub_type = (coinflip() ? WAND_FLAME
                                                           : WAND_FROST);
            }

[8.3098]

[38.103181]

            if (wand.sub_type == WAND_FIRE)
                wand.sub_type = WAND_FLAME;
            if (wand.sub_type == WAND_COLD)
                wand.sub_type = WAND_FROST;
            if (wand.sub_type == WAND_LIGHTNING)
                wand.sub_type = (coinflip() ? WAND_FLAME : WAND_FROST);

Replacement in crawl-ref/source/makeitem.cc at line 3072 [38.927]

B:BD[38.103192] → [38.103192:103231]

B:BD[38.103231] → [44.14874:14922]

        mitm[thing_created].flags = 0;
        _give_monster_item(mon, thing_created);

[38.103192]

[38.103278]

        wand.flags = 0;
        _give_monster_item(mon, idx);

Deletion in crawl-ref/source/makeitem.cc at line 3079 [38.927]
B:BD[38.103339] → [38.103339:103362]
```
    //mv - give potion
```

Replacement in crawl-ref/source/makeitem.cc at line 3140 [38.927]

B:BD[38.104754] → [38.104754:104872]

B:BD[38.104872] → [44.15282:15424]


            const int temp_rand = random2(5);
            item.sub_type = ((temp_rand > 2) ? WPN_DAGGER :     // 40%
                             (temp_rand > 0) ? WPN_SHORT_SWORD  // 40%
                                             : WPN_CLUB);       // 20%

[38.104754]

[38.105022]

            item.sub_type = random_choose(WPN_DAGGER,      WPN_DAGGER,
                                          WPN_SHORT_SWORD, WPN_SHORT_SWORD,
                                          WPN_CLUB,        -1);

Replacement in crawl-ref/source/makeitem.cc at line 3189 [38.927]

B:BD[10.3630] → [10.3630:3930]

            const int temp_rand = random2(4);
            item.sub_type = ((temp_rand == 0) ? WPN_SPIKED_FLAIL :
                             (temp_rand == 1) ? WPN_GREAT_MACE :
                             (temp_rand == 2) ? WPN_WAR_AXE
                                              : WPN_TRIDENT);

[10.3630]

[10.3930]

            item.sub_type = random_choose(WPN_SPIKED_FLAIL, WPN_GREAT_MACE,
                                          WPN_WAR_AXE,      WPN_TRIDENT,   -1);

Replacement in crawl-ref/source/makeitem.cc at line 3194 [38.927]

B:BD[10.3963] → [10.3963:4775]

            const int temp_rand = random2(12);
            item.sub_type = ((temp_rand ==  0) ? WPN_MACE :
                             (temp_rand ==  1) ? WPN_FLAIL :
                             (temp_rand ==  2) ? WPN_MORNINGSTAR :
                             (temp_rand ==  3) ? WPN_DAGGER :
                             (temp_rand ==  4) ? WPN_SHORT_SWORD :
                             (temp_rand ==  5) ? WPN_LONG_SWORD :
                             (temp_rand ==  6) ? WPN_SCIMITAR :
                             (temp_rand ==  7) ? WPN_GREAT_SWORD :
                             (temp_rand ==  8) ? WPN_HAND_AXE :
                             (temp_rand ==  9) ? WPN_BATTLEAXE :
                             (temp_rand == 10) ? WPN_SPEAR
                                               : WPN_HALBERD);

[10.3963]

[10.4775]

            item.sub_type = random_choose(
                WPN_MACE,      WPN_FLAIL,       WPN_MORNINGSTAR,
                WPN_DAGGER,    WPN_SHORT_SWORD, WPN_LONG_SWORD,
                WPN_SCIMITAR,  WPN_GREAT_SWORD, WPN_HAND_AXE,
                WPN_BATTLEAXE, WPN_SPEAR,       WPN_HALBERD,
                -1);

Replacement in crawl-ref/source/makeitem.cc at line 3209 [38.927]

B:BD[38.106681] → [38.106681:106753]

                set_item_ego_type( item, OBJ_WEAPONS, SPWPN_FREEZING );

[38.106681]

[38.106753]

                set_item_ego_type(item, OBJ_WEAPONS, SPWPN_FREEZING);

Replacement in crawl-ref/source/makeitem.cc at line 3226 [38.927]

B:BD[38.107113] → [38.107113:107227]

B:BD[38.107227] → [44.15495:15696]


            const int temp_rand = random2(5);
            item.sub_type = ((temp_rand >  2) ? WPN_SPEAR : // 40%
                             (temp_rand == 2) ? WPN_FLAIL : // 20%
                             (temp_rand == 1) ? WPN_HALBERD // 20%
                                              : WPN_CLUB);  // 20%

[38.107113]

[38.107440]

            item.sub_type = random_choose(WPN_SPEAR,   WPN_SPEAR, WPN_FLAIL,
                                          WPN_HALBERD, WPN_CLUB,  -1);

Replacement in crawl-ref/source/makeitem.cc at line 3242 [38.927]

B:BD[38.107962] → [38.107962:108087]

B:BD[38.108087] → [44.15697:16685]


            const int temp_rand = random2(240);
            item.sub_type = ((temp_rand > 209) ? WPN_DAGGER :      //12.50%
                             (temp_rand > 179) ? WPN_CLUB :        //12.50%
                             (temp_rand > 152) ? WPN_FLAIL :       //11.25%
                             (temp_rand > 128) ? WPN_HAND_AXE :    //10.00%
                             (temp_rand > 108) ? WPN_HAMMER :      // 8.33%
                             (temp_rand >  88) ? WPN_HALBERD :     // 8.33%
                             (temp_rand >  68) ? WPN_SHORT_SWORD : // 8.33%
                             (temp_rand >  48) ? WPN_MACE :        // 8.33%
                             (temp_rand >  38) ? WPN_WHIP :        // 4.17%
                             (temp_rand >  28) ? WPN_TRIDENT :     // 4.17%
                             (temp_rand >  18) ? WPN_FALCHION :    // 4.17%
                             (temp_rand >   8) ? WPN_MORNINGSTAR : // 4.17%
                             (temp_rand >   2) ? WPN_WAR_AXE       // 2.50%
                                               : WPN_SPIKED_FLAIL);// 1.25%

[38.107962]

[38.109131]

            item.sub_type = random_choose_weighted(
                30, WPN_DAGGER,      30, WPN_CLUB,
                27, WPN_FLAIL,       24, WPN_HAND_AXE,
                20, WPN_HAMMER,      20, WPN_SHORT_SWORD,
                20, WPN_MACE,        10, WPN_WHIP,
                10, WPN_TRIDENT,     10, WPN_FALCHION,
                10, WPN_MORNINGSTAR, 6,  WPN_WAR_AXE,
                3, WPN_SPIKED_FLAIL,
                0);

Deletion in crawl-ref/source/makeitem.cc at line 3261 [38.927]
B:BD[38.109364] → [38.109364:109370]
```
    {
```

Replacement in crawl-ref/source/makeitem.cc at line 3263 [38.927]

B:BD[38.109445] → [38.109445:109561]

B:BD[38.109561] → [45.1659:2014]

B:BD[45.2014] → [44.16686:16757]


        const int temp_rand = random2(100);
        item.sub_type = ((temp_rand > 79) ? WPN_LONG_SWORD :    // 20%
                         (temp_rand > 59) ? WPN_SHORT_SWORD :   // 20%
                         (temp_rand > 45) ? WPN_SCIMITAR :      // 14%
                         (temp_rand > 31) ? WPN_MACE :          // 14%
                         (temp_rand > 18) ? WPN_BOW :           // 13%
                         (temp_rand >  5) ? WPN_HAND_CROSSBOW   // 13%
                                          : WPN_LONGBOW);       //  6%

[38.109445]

[46.4843]

        item.sub_type = random_choose_weighted(
            20, WPN_LONG_SWORD, 20, WPN_SHORT_SWORD, 14, WPN_SCIMITAR,
            14, WPN_MACE,       13, WPN_BOW,         13, WPN_HAND_CROSSBOW,
            5,  WPN_LONGBOW,
            0);

Deletion in crawl-ref/source/makeitem.cc at line 3269 [38.927]
B:BD[46.4858] → [46.4858:4864]
```
    }
```
Deletion in crawl-ref/source/makeitem.cc at line 3292 [38.927]
B:BD[46.5586] → [46.5586:5592]
```
    {
```
Deletion in crawl-ref/source/makeitem.cc at line 3296 [38.927]
B:BD[38.110026] → [38.110026:110032]
```
    }
```
Deletion in crawl-ref/source/makeitem.cc at line 3311 [38.927]
B:BD[38.110405] → [38.110405:110411]
```
    {
```

Replacement in crawl-ref/source/makeitem.cc at line 3312 [38.927]

B:BD[38.110552] → [38.110552:110665]

B:BD[38.110665] → [44.16780:17060]


        const int temp_rand = random2(6);
        item.sub_type = ((temp_rand > 3) ? WPN_LONG_SWORD : // 2 in 6
                         (temp_rand > 2) ? WPN_SHORT_SWORD :// 1 in 6
                         (temp_rand > 1) ? WPN_SABRE :      // 1 in 6
                         (temp_rand > 0) ? WPN_DAGGER       // 1 in 6
                                         : WPN_WHIP);       // 1 in 6

[38.110552]

[38.110961]

        item.sub_type = random_choose(WPN_LONG_SWORD,  WPN_LONG_SWORD,
                                      WPN_SHORT_SWORD, WPN_SABRE,
                                      WPN_DAGGER,      WPN_WHIP,
                                      -1);

Replacement in crawl-ref/source/makeitem.cc at line 3317 [38.927]
B:BD[38.110976] → [38.110976:110982]
```
    }
```
[38.110976]
[38.110982]
Deletion in crawl-ref/source/makeitem.cc at line 3345 [38.927]
B:BD[38.111749] → [38.111749:111755]
```
    {
```

Replacement in crawl-ref/source/makeitem.cc at line 3349 [38.927]

B:BD[38.111794] → [38.111794:111911]

B:BD[38.111911] → [44.17061:18010]

        const int temp_rand = random2(120);
        item.sub_type = ((temp_rand > 109) ? WPN_LONG_SWORD :   // 8.33%
                         (temp_rand >  99) ? WPN_SHORT_SWORD :  // 8.33%
                         (temp_rand >  89) ? WPN_SCIMITAR :     // 8.33%
                         (temp_rand >  79) ? WPN_BATTLEAXE :    // 8.33%
                         (temp_rand >  69) ? WPN_HAND_AXE :     // 8.33%
                         (temp_rand >  59) ? WPN_HALBERD :      // 8.33%
                         (temp_rand >  49) ? WPN_GLAIVE :       // 8.33%
                         (temp_rand >  39) ? WPN_MORNINGSTAR :  // 8.33%
                         (temp_rand >  29) ? WPN_GREAT_MACE :   // 8.33%
                         (temp_rand >  19) ? WPN_TRIDENT :      // 8.33%
                         (temp_rand >  10) ? WPN_WAR_AXE :      // 7.50%
                         (temp_rand >   1) ? WPN_FLAIL :        // 7.50%
                         (temp_rand >   0) ? WPN_BROAD_AXE      // 0.83%
                                           : WPN_SPIKED_FLAIL); // 0.83%

[38.111793]

[38.112916]

        item.sub_type = random_choose_weighted(
            10, WPN_LONG_SWORD, 10, WPN_SHORT_SWORD,
            10, WPN_SCIMITAR,   10, WPN_BATTLEAXE,
            10, WPN_HAND_AXE,   10, WPN_HALBERD,
            10, WPN_GLAIVE,     10, WPN_MORNINGSTAR,
            10, WPN_GREAT_MACE, 10, WPN_TRIDENT,
            9,  WPN_WAR_AXE,     9, WPN_FLAIL,
            1,  WPN_BROAD_AXE,   1, WPN_SPIKED_FLAIL,
            0);

Replacement in crawl-ref/source/makeitem.cc at line 3359 [38.927]
B:BD[38.112931] → [38.112931:112937]
```
    }
```
[38.112931]
[38.112937]

Replacement in crawl-ref/source/makeitem.cc at line 3390 [38.927]

B:BD[38.113409] → [38.113409:113523]

B:BD[38.113523] → [44.18011:18650]

        const int temp_rand = random2(25);
        item.sub_type = ((temp_rand > 20) ? WPN_GREAT_SWORD :   // 16%
                         (temp_rand > 16) ? WPN_LONG_SWORD :    // 16%
                         (temp_rand > 12) ? WPN_BATTLEAXE :     // 16%
                         (temp_rand >  8) ? WPN_WAR_AXE :       // 16%
                         (temp_rand >  5) ? WPN_GREAT_MACE :    // 12%
                         (temp_rand >  3) ? WPN_DIRE_FLAIL :    //  8%
                         (temp_rand >  2) ? WPN_BARDICHE :      //  4%
                         (temp_rand >  1) ? WPN_GLAIVE :        //  4%
                         (temp_rand >  0) ? WPN_BROAD_AXE       //  4%
                                          : WPN_HALBERD);       //  4%

[38.113409]

[38.114198]

        item.sub_type = random_choose_weighted(
            4, WPN_GREAT_SWORD, 4, WPN_LONG_SWORD,
            4, WPN_BATTLEAXE,   4, WPN_WAR_AXE,
            3, WPN_GREAT_MACE,  2, WPN_DIRE_FLAIL,
            1, WPN_BARDICHE,    1, WPN_GLAIVE,
            1, WPN_BROAD_AXE,   1, WPN_HALBERD,
            0);

Deletion in crawl-ref/source/makeitem.cc at line 3556 [38.927]
B:BD[38.118194] → [38.118194:118200]
```
    {
```

Replacement in crawl-ref/source/makeitem.cc at line 3585 [38.927]

B:BD[38.119361] → [39.350:396]

B:BD[39.396] → [40.5639:5689]

∅:D[40.5689] → [38.119449:119650]

B:BD[38.119449] → [38.119449:119650]

B:BD[38.119650] → [40.5690:5759]

∅:D[40.5759] → [38.119720:119788]

B:BD[38.119720] → [38.119720:119788]

            const int temp_rand = random2(5);
            set_item_ego_type( item, OBJ_WEAPONS,
                                ((temp_rand == 0) ? SPWPN_DRAINING :
                                 (temp_rand == 1) ? SPWPN_VORPAL :
                                 (temp_rand == 2) ? SPWPN_PAIN :
                                 (temp_rand == 3) ? SPWPN_DISTORTION
                                                  : SPWPN_SPEED) );

[38.119361]

[38.119788]

            set_item_ego_type(item, OBJ_WEAPONS,
                              random_choose(SPWPN_DRAINING, SPWPN_VORPAL,
                                            SPWPN_PAIN,     SPWPN_DISTORTION,
                                            SPWPN_SPEED,    -1));

Replacement in crawl-ref/source/makeitem.cc at line 3601 [38.927]
B:BD[38.120075] → [38.120075:120081]
```
    }
```
[38.120075]
[38.120081]

Replacement in crawl-ref/source/makeitem.cc at line 3666 [38.927]

∅:D[10.5035] → [43.21260:21721]

B:BD[43.21260] → [43.21260:21721]

        {
            const int temp_rand = random2(5);
            set_item_ego_type( item, OBJ_WEAPONS,
                                ((temp_rand == 0) ? SPWPN_VENOM :
                                 (temp_rand == 1) ? SPWPN_DRAINING :
                                 (temp_rand == 2) ? SPWPN_VAMPIRICISM :
                                 (temp_rand == 3) ? SPWPN_DISTORTION
                                                  : SPWPN_NORMAL) );
        }

[10.5035]

[43.21721]

        set_item_ego_type(item, OBJ_WEAPONS,
                          random_choose(SPWPN_VENOM,       SPWPN_DRAINING,
                                        SPWPN_VAMPIRICISM, SPWPN_DISTORTION,
                                        SPWPN_NORMAL,      -1));

Replacement in crawl-ref/source/makeitem.cc at line 3675 [38.927]

B:BD[43.21839] → [43.21839:21952]

        item.sub_type = (one_chance_in(3) ? WPN_FALCHION
                                          : WPN_SABRE);

[43.21839]

[43.21952]

        item.sub_type = (one_chance_in(3) ? WPN_FALCHION : WPN_SABRE);

Deletion in crawl-ref/source/makeitem.cc at line 3703 [38.927]
B:BD[38.122175] → [38.122175:122181]
```
    {
```

Replacement in crawl-ref/source/makeitem.cc at line 3706 [38.927]

B:BD[38.122285] → [38.122285:122390]

B:BD[38.122390] → [44.19036:19317]

        const int temp_rand = random2(6);
        item.sub_type = ((temp_rand == 5) ? WPN_GREAT_SWORD :
                         (temp_rand == 4) ? WPN_TRIDENT :
                         (temp_rand == 3) ? WPN_SPEAR :
                         (temp_rand == 2) ? WPN_GLAIVE :
                         (temp_rand == 1) ? WPN_BOW
                                          : WPN_HALBERD);

[38.122285]

[38.122691]

        item.sub_type = random_choose(WPN_GREAT_SWORD, WPN_TRIDENT,
                                      WPN_SPEAR,       WPN_GLAIVE,
                                      WPN_BOW,         WPN_HALBERD,
                                      -1);

Replacement in crawl-ref/source/makeitem.cc at line 3711 [38.927]

B:BD[38.122692] → [38.122692:122872]

        if (is_range_weapon(item))
            set_item_ego_type( item, OBJ_WEAPONS, SPWPN_FLAME );
        else
            set_item_ego_type( item, OBJ_WEAPONS, SPWPN_FLAMING );

[38.122692]

[38.122872]

        set_item_ego_type(item, OBJ_WEAPONS, is_range_weapon(item) ?
                          SPWPN_FLAME : SPWPN_FLAMING);

Deletion in crawl-ref/source/makeitem.cc at line 3718 [38.927]
B:BD[38.123017] → [38.123017:123023]
```
    }
```
Deletion in crawl-ref/source/effects.cc at line 1160 [14.3382105]
∅:D[47.12403] → [14.3403850:3403851]
B:BD[14.3403850] → [14.3403850:3403851]
B:BD[14.3403851] → [47.12404:12504]
```
static int _choose_first_unseen_book(int first, ...)
{
    va_list args;
    va_start(args, first);
```
Deletion in crawl-ref/source/effects.cc at line 1161 [14.3382105]
B:BD[14.3404016] → [47.12505:12615]
∅:D[47.12615] → [14.3404148:3404149]
B:BD[14.3404148] → [14.3404148:3404149]
B:BD[14.3404149] → [47.12616:12637]
∅:D[48.3103] → [14.3404439:3404440]
∅:D[47.12637] → [14.3404439:3404440]
B:BD[14.3404439] → [14.3404439:3404440]
B:BD[14.3404440] → [47.12638:12857]
∅:D[47.12857] → [14.3405408:3405409]
B:BD[14.3405408] → [14.3405408:3405409]
B:BD[14.3405409] → [47.12858:12881]
∅:D[47.12881] → [14.3405717:3405718]
B:BD[14.3405717] → [14.3405717:3405718]
B:BD[14.3405718] → [47.12882:12924]
B:BD[47.18500] → [47.18500:18502]
∅:D[11.4091] → [14.3413805:3413806]
∅:D[47.18502] → [14.3413805:3413806]
B:BD[14.3413805] → [14.3413805:3413806]
```
    if (first == NUM_BOOKS || !you.had_book[first])
    {
        va_end(args);
        return (first);
    }
    int nargs = 100;
    while (nargs-- > 0)
    {
        const int another = va_arg(args, int);
        if (another == NUM_BOOKS || !you.had_book[another])
        {
            va_end(args);
            return (another);
        }
    }
    ASSERT(nargs > 0);
    va_end(args);
    return (NUM_BOOKS);
}
```

Fix warning.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/view.cc at line 738 [14.16817]

Replacement in crawl-ref/source/view.cc at line 745 [14.16817]

Insertion in crawl-ref/source/view.cc at line 769 [14.16817]

Replacement in crawl-ref/source/view.cc at line 905 [14.16817]

Replacement in crawl-ref/source/view.cc at line 967 [14.16817]

Deletion in crawl-ref/source/view.cc at line 969 [14.16817]

Replacement in crawl-ref/source/view.cc at line 1491 [14.16817]

Replacement in crawl-ref/source/view.cc at line 1653 [14.16817]

Deletion in crawl-ref/source/stuff.cc at line 1298 [14.224557]

Replacement in crawl-ref/source/spl-cast.cc at line 1190 [14.293070]

Deletion in crawl-ref/source/spells2.h at line 17 [14.562867]

Replacement in crawl-ref/source/spells2.h at line 18 [14.562867]

Replacement in crawl-ref/source/spells2.cc at line 823 [14.569242]

Replacement in crawl-ref/source/spells2.cc at line 827 [14.569242]

Replacement in crawl-ref/source/spells2.cc at line 831 [14.569242]

Deletion in crawl-ref/source/spells2.cc at line 835 [14.569242]

Replacement in crawl-ref/source/spells2.cc at line 1176 [14.569242]

Replacement in crawl-ref/source/spells2.cc at line 1182 [14.569242]

Deletion in crawl-ref/source/spells2.cc at line 1193 [14.569242]

Replacement in crawl-ref/source/makeitem.cc at line 2880 [38.927]

Replacement in crawl-ref/source/makeitem.cc at line 2883 [38.927]

Replacement in crawl-ref/source/makeitem.cc at line 2892 [38.927]

Replacement in crawl-ref/source/makeitem.cc at line 2902 [38.927]

Replacement in crawl-ref/source/makeitem.cc at line 2906 [38.927]

Deletion in crawl-ref/source/makeitem.cc at line 3048 [38.927]

Replacement in crawl-ref/source/makeitem.cc at line 3050 [38.927]

Replacement in crawl-ref/source/makeitem.cc at line 3052 [38.927]

Insertion in crawl-ref/source/makeitem.cc at line 3054 [38.927]

Replacement in crawl-ref/source/makeitem.cc at line 3062 [38.927]

Replacement in crawl-ref/source/makeitem.cc at line 3072 [38.927]

Deletion in crawl-ref/source/makeitem.cc at line 3079 [38.927]

Replacement in crawl-ref/source/makeitem.cc at line 3140 [38.927]

Replacement in crawl-ref/source/makeitem.cc at line 3189 [38.927]

Replacement in crawl-ref/source/makeitem.cc at line 3194 [38.927]

Replacement in crawl-ref/source/makeitem.cc at line 3209 [38.927]

Replacement in crawl-ref/source/makeitem.cc at line 3226 [38.927]

Replacement in crawl-ref/source/makeitem.cc at line 3242 [38.927]

Deletion in crawl-ref/source/makeitem.cc at line 3261 [38.927]

Replacement in crawl-ref/source/makeitem.cc at line 3263 [38.927]

Deletion in crawl-ref/source/makeitem.cc at line 3269 [38.927]

Deletion in crawl-ref/source/makeitem.cc at line 3292 [38.927]

Deletion in crawl-ref/source/makeitem.cc at line 3296 [38.927]

Deletion in crawl-ref/source/makeitem.cc at line 3311 [38.927]

Replacement in crawl-ref/source/makeitem.cc at line 3312 [38.927]

Replacement in crawl-ref/source/makeitem.cc at line 3317 [38.927]

Deletion in crawl-ref/source/makeitem.cc at line 3345 [38.927]

Replacement in crawl-ref/source/makeitem.cc at line 3349 [38.927]

Replacement in crawl-ref/source/makeitem.cc at line 3359 [38.927]

Replacement in crawl-ref/source/makeitem.cc at line 3390 [38.927]

Deletion in crawl-ref/source/makeitem.cc at line 3556 [38.927]

Replacement in crawl-ref/source/makeitem.cc at line 3585 [38.927]

Replacement in crawl-ref/source/makeitem.cc at line 3601 [38.927]

Replacement in crawl-ref/source/makeitem.cc at line 3666 [38.927]

Replacement in crawl-ref/source/makeitem.cc at line 3675 [38.927]

Deletion in crawl-ref/source/makeitem.cc at line 3703 [38.927]

Replacement in crawl-ref/source/makeitem.cc at line 3706 [38.927]

Replacement in crawl-ref/source/makeitem.cc at line 3711 [38.927]

Deletion in crawl-ref/source/makeitem.cc at line 3718 [38.927]

Deletion in crawl-ref/source/effects.cc at line 1160 [14.3382105]

Deletion in crawl-ref/source/effects.cc at line 1161 [14.3382105]