fiddlerwoaroof/crawl - Change 45CWQUPQHKUFUJ4MVL5K3KCVCCKLY2Z7RZWZ53UT723RV5STPSRAC

Minor cleanups (especially of Xom code.)

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

Created by haranp on July 3, 2007

45CWQUPQHKUFUJ4MVL5K3KCVCCKLY2Z7RZWZ53UT723RV5STPSRAC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/xom.cc at line 170 [5.3]

B:BD[5.5313] → [5.5313:5522]

}
static void xom_suggest(const char **messages, int nmsgs)
{
    if (nmsgs && messages)
    {
        const char *sel = messages[random2(nmsgs)];
        if (sel)
            god_speaks(GOD_XOM, sel);
    }

Deletion in crawl-ref/source/xom.cc at line 171 [5.3]
B:BD[5.5524] → [5.5524:5573]
```
#define XOM_SAY(x) xom_suggest(x, ARRAYSIZE(x))
```

Replacement in crawl-ref/source/xom.cc at line 208 [5.3]

B:BD[5.6475] → [5.6475:6546]

            // If you are wielding a cursed item on then Xom will give

[5.6475]

[5.6546]

            // If you are wielding a cursed item then Xom will give

Replacement in crawl-ref/source/xom.cc at line 210 [5.3]

B:BD[5.6599] → [5.6599:6634]

            XOM_SAY(xom_try_this);

[5.6599]

[5.6634]

            god_speaks(GOD_XOM, RANDOM_ELEMENT(xom_try_this));

Replacement in crawl-ref/source/xom.cc at line 226 [5.3]

B:BD[5.7215] → [5.7215:7250]

            XOM_SAY(xom_try_this);

[5.7215]

[5.7250]

            god_speaks(GOD_XOM, RANDOM_ELEMENT(xom_try_this));

Replacement in crawl-ref/source/xom.cc at line 236 [5.3]

B:BD[5.7595] → [5.7595:7630]

            XOM_SAY(xom_try_this);

[5.7595]

[5.7630]

            god_speaks(GOD_XOM, RANDOM_ELEMENT(xom_try_this));

Replacement in crawl-ref/source/xom.cc at line 248 [5.3]

B:BD[5.8122] → [5.8122:8162]

            XOM_SAY(xom_try_this_ring);

[5.8122]

[5.8162]

            god_speaks(GOD_XOM, RANDOM_ELEMENT(xom_try_this_ring));

Replacement in crawl-ref/source/xom.cc at line 257 [5.3]

B:BD[5.8448] → [5.8448:8495]

            XOM_SAY(xom_try_this_other_thing);

[5.8448]

[5.8495]

            god_speaks(GOD_XOM, RANDOM_ELEMENT(xom_try_this_other_thing));

Replacement in crawl-ref/source/xom.cc at line 282 [5.3]

B:BD[5.9162] → [5.9162:9199]

        XOM_SAY(xom_try_these_duds);

[5.9162]

[5.9199]

        god_speaks(GOD_XOM, RANDOM_ELEMENT(xom_try_these_duds));

Replacement in crawl-ref/source/xom.cc at line 291 [5.3]

B:BD[5.9443] → [5.9443:9481]

    XOM_SAY(xom_generic_beneficence);

[5.9443]

[5.9481]

    god_speaks(GOD_XOM, RANDOM_ELEMENT(xom_generic_beneficence));

Insertion in crawl-ref/source/xom.cc at line 370 [5.3]

[5.11718]

static int xom_random_demon(int sever)
{
    int demontype;
    do
    {
        // XXX Change the 20 if we add/remove demons!
        // XXX Maybe we should use summon_any_demon() instead?
        demontype = MONS_WHITE_IMP +
            std::min(random2(random2(random2(sever))), 20);
        // Don't make Green Deaths for non-poison-resistant characters.
    } while ( demontype == MONS_GREEN_DEATH && !player_res_poison());
    return demontype;
}

Replacement in crawl-ref/source/xom.cc at line 455 [5.3]

B:BD[5.13746] → [5.13746:13893]

        int i;
        int r = random2(random2(random2(sever+1)+1)+1)+2;
        int numdemons = MIN(r, 24);
        for (i=0; i < numdemons; i++)

[5.13746]

[5.13893]

        int numdemons = std::min(random2(random2(random2(sever+1)+1)+1)+2, 24);
        for (int i = 0; i < numdemons; i++)

Replacement in crawl-ref/source/xom.cc at line 458 [5.3]

B:BD[5.13903] → [5.13903:14538]

            r = random2(random2(random2(sever)));
            int demonnum = MONS_WHITE_IMP + MIN(r, 20);
            if (!player_res_poison())
            {
                while (demonnum == MONS_GREEN_DEATH)
                {
                    r = random2(random2(random2(sever)));
                    demonnum = MONS_WHITE_IMP + MIN(r, 20);
                }
            }
            ASSERT (demonnum >= MONS_WHITE_IMP);
            ASSERT (demonnum <= MONS_WHITE_IMP+20);
            create_monster(demonnum, 3, 
                           BEH_GOD_GIFT, you.x_pos, you.y_pos, 
                           you.pet_target, 250 );

[5.13903]

[5.14538]

            create_monster(xom_random_demon(sever), 3, BEH_GOD_GIFT,
                           you.x_pos, you.y_pos, you.pet_target, 250 );

Replacement in crawl-ref/source/xom.cc at line 471 [5.3]

B:BD[5.14730] → [5.14730:15329]

        int r = random2(random2(random2(sever)));
        int demonnum = MONS_WHITE_IMP + MIN(r, 20);
        ASSERT (demonnum >= MONS_WHITE_IMP);
        ASSERT (demonnum <= MONS_WHITE_IMP+20);
        if (!player_res_poison())
        {
            while (demonnum == MONS_GREEN_DEATH)
            {
                r = random2(random2(random2(sever)));
                demonnum = MONS_WHITE_IMP + MIN(r, 20);
            }
        }
        if (create_monster( demonnum, 6, 
                            BEH_GOD_GIFT, you.x_pos, you.y_pos,
                            you.pet_target, 250 ) != -1)

[5.14730]

[5.15329]

        if (create_monster(xom_random_demon(sever), 6, BEH_GOD_GIFT,
                           you.x_pos, you.y_pos, you.pet_target, 250) != -1)

Replacement in crawl-ref/source/xom.cc at line 537 [5.3]

B:BD[5.17557] → [5.17557:17955]

        int r = random2(random2(random2(sever)));
        int demonnum = MONS_WHITE_IMP + MIN(r, 20);
        if (!player_res_poison())
        {
            while (demonnum == MONS_GREEN_DEATH)
            {
                r = random2(random2(random2(sever)));
                demonnum = MONS_WHITE_IMP + MIN(r, 20);
            }
        }
        if (create_monster( demonnum, 0, BEH_GOD_GIFT,

[5.17557]

[5.17955]

        if (create_monster( xom_random_demon(sever), 0, BEH_GOD_GIFT,

Replacement in crawl-ref/source/xom.cc at line 550 [5.3]

B:BD[5.18430] → [5.18430:18577]

        bool lightningprot = false;
        if (you.hp <= random2(201)
            && !you.attribute[ATTR_DIVINE_LIGHTNING_PROTECTION])
        {

[5.18430]

[5.18577]

        if (you.hp <= random2(201))

Replacement in crawl-ref/source/xom.cc at line 552 [5.3]
B:BD[5.18642] → [5.18642:18676]
B:BD[5.18676] → [2.155:178]
∅:D[2.178] → [5.18691:18726]
B:BD[5.18691] → [5.18691:18726]
```
            lightningprot = true;
        }
        else
            lightningprot = false;
```
[5.18642]
[5.18726]
Replacement in crawl-ref/source/xom.cc at line 570 [5.3]
B:BD[5.19321] → [5.19321:19348]
```
        if (lightningprot)
```
[5.19321]
[5.19348]
```
        if (you.attribute[ATTR_DIVINE_LIGHTNING_PROTECTION])
```

Replacement in crawl-ref/source/xom.cc at line 735 [5.3]

B:BD[5.25492] → [5.25492:25602]

                int r = random2(random2(random2(sever+1)+1)+1)+1;
                int numdemons = MIN(r, 24);

[5.25492]

[5.25602]

                const int numdemons =
                    std::min(random2(random2(random2(sever+1)+1)+1)+1, 24);

Replacement in crawl-ref/source/xom.cc at line 739 [5.3]

B:BD[5.25672] → [5.25672:25910]

                    create_monster(MONS_WHITE_IMP +
                                   random2(random2(random2(MIN(sever, 22)))),
                                   4,
                                   BEH_HOSTILE, you.x_pos, you.y_pos,

[5.25672]

[5.25910]

                    create_monster(MONS_WHITE_IMP + random2(random2(random2(std::min(sever,22)))),
                                   4, BEH_HOSTILE, you.x_pos, you.y_pos,

Replacement in crawl-ref/source/xom.cc at line 762 [5.3]

B:BD[5.26623] → [5.26623:26698]

        else if ((random2(sever) == 0) && (you.level_type != LEVEL_ABYSS))

[5.26623]

[5.26698]

        else if (one_chance_in(sever) && (you.level_type != LEVEL_ABYSS))

Replacement in crawl-ref/source/spells2.cc at line 1323 [6.569242]

B:BD[4.260] → [4.260:323]

            mon_chosen = animals[random2(ARRAYSIZE(animals))];

[4.260]

[4.323]

            mon_chosen = RANDOM_ELEMENT(animals);

Replacement in crawl-ref/source/religion.cc at line 458 [6.804403]

B:BD[7.401] → [7.401:453]

                    misc_item_type pure_decks[] = {

[7.401]

[7.453]

                    const misc_item_type pure_decks[] = {

Replacement in crawl-ref/source/religion.cc at line 465 [6.804403]

B:BD[7.711] → [7.711:787]

                    gift_type = pure_decks[random2(ARRAYSIZE(pure_decks))];

[7.711]

[7.787]

                    gift_type = RANDOM_ELEMENT(pure_decks);

Replacement in crawl-ref/source/religion.cc at line 470 [6.804403]

B:BD[7.885] → [7.885:938]

                    misc_item_type mixed_decks[] = {

[7.885]

[7.938]

                    const misc_item_type mixed_decks[] = {

Replacement in crawl-ref/source/religion.cc at line 475 [6.804403]

B:BD[7.1094] → [7.1094:1172]

                    gift_type = mixed_decks[random2(ARRAYSIZE(mixed_decks))];

[7.1094]

[7.1172]

                    gift_type = RANDOM_ELEMENT(mixed_decks);

Replacement in crawl-ref/source/randart.cc at line 1385 [6.893152]

B:BD[3.1579] → [3.1579:1649]

        result += rand_wpn_names[random2(ARRAYSIZE(rand_wpn_names))];

[3.1579]

[6.925297]

        result += RANDOM_ELEMENT(rand_wpn_names);

Replacement in crawl-ref/source/randart.cc at line 1460 [6.893152]

B:BD[3.3049] → [3.3049:3125]

        result += rand_armour_names[random2(ARRAYSIZE(rand_armour_names))];

[3.3049]

[6.928047]

        result += RANDOM_ELEMENT(rand_armour_names);

Replacement in crawl-ref/source/randart.cc at line 1541 [6.893152]

B:BD[3.4607] → [3.4607:4683]

        result += rand_armour_names[random2(ARRAYSIZE(rand_armour_names))];

[3.4607]

[6.930884]

        result += RANDOM_ELEMENT(rand_armour_names);

Replacement in crawl-ref/source/misc.cc at line 1914 [6.1933596]

B:BD[8.745] → [8.745:807]

                    struct monsters *mon = &menv[targ_monst];

[8.745]

[8.807]

                    const monsters *mon = &menv[targ_monst];

Replacement in crawl-ref/source/fight.cc at line 1764 [6.3140790]

B:BD[9.5261] → [9.5261:5383]

            verb =
                claw_verbs[
                    random2( sizeof(claw_verbs) / sizeof(*claw_verbs) ) ];

[9.5261]

[9.5383]

            verb = RANDOM_ELEMENT(claw_verbs);

Replacement in crawl-ref/source/fight.cc at line 1772 [6.3140790]

B:BD[9.5539] → [9.5539:5664]

            verb =
                slice_verbs[
                    random2( sizeof(slice_verbs) / sizeof(*slice_verbs) ) ];

[9.5539]

[9.5664]

            verb = RANDOM_ELEMENT(slice_verbs);

Insertion in crawl-ref/source/defines.h at line 293 [6.3982910]
[5.55696]
[5.55696]
```
#define RANDOM_ELEMENT(x) (x[random2(ARRAYSIZE(x))])
```

Replacement in crawl-ref/source/decks.cc at line 819 [6.3987460]

B:BD[6.4002421] → [7.24111:24179]

    potion_type pot = pot_effects[random2(ARRAYSIZE(pot_effects))];

[6.4002421]

[6.4002446]

    potion_type pot = RANDOM_ELEMENT(pot_effects);