fiddlerwoaroof/crawl - Change AA3I6WU2SPJUPKRIPGXCLU4EZOV4QELVVZ7EIAW3H73GES5DSFXQC

Add more minor cosmetic fixes.

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

Created by dolorous on January 3, 2009

AA3I6WU2SPJUPKRIPGXCLU4EZOV4QELVVZ7EIAW3H73GES5DSFXQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/xom.cc at line 824 [7.3]

B:BD[5.738] → [6.4:74]

∅:D[6.74] → [5.794:870]

B:BD[5.794] → [5.794:870]

                    mgen_data(monster, BEH_FRIENDLY, 3, MON_SUMM_AID,
                        you.pos(), you.pet_target, MG_FORCE_BEH, GOD_XOM));

[5.738]

[8.846]

                    mgen_data(monster, BEH_FRIENDLY,
                        3, MON_SUMM_AID,
                        you.pos(), you.pet_target,
                        MG_FORCE_BEH, GOD_XOM));

Replacement in crawl-ref/source/xom.cc at line 902 [7.3]

B:BD[9.60] → [6.75:129]

∅:D[6.129] → [9.100:165]

B:BD[9.100] → [9.100:165]

                mgen_data(mon, beha, 6, MON_SUMM_AID,
                    you.pos(), hitting, MG_FORCE_BEH, GOD_XOM));

[9.60]

[10.397]

                mgen_data(mon, beha,
                    6, MON_SUMM_AID,
                    you.pos(), hitting,
                    MG_FORCE_BEH, GOD_XOM));

Replacement in crawl-ref/source/xom.cc at line 1068 [7.3]

B:BD[9.222] → [9.222:366]

                mgen_data(_xom_random_demon(sever, one_chance_in(8)), beha, 0,
                    you.pos(), hitting, MG_FORCE_BEH, GOD_XOM));

[9.222]

[11.785]

                mgen_data(_xom_random_demon(sever, one_chance_in(8)), beha,
                    0, 0, you.pos(), hitting,
                    MG_FORCE_BEH, GOD_XOM));

Replacement in crawl-ref/source/spells3.cc at line 549 [13.531613]

B:BD[12.2111] → [6.977:1056]

            mgen_data(RANDOM_MONSTER, BEH_FRIENDLY, 2, SPELL_SHADOW_CREATURES,

[12.2111]

[12.2166]

            mgen_data(RANDOM_MONSTER, BEH_FRIENDLY,
                      2, SPELL_SHADOW_CREATURES,

Replacement in crawl-ref/source/spells3.cc at line 814 [13.531613]

B:BD[12.2450] → [12.2450:2502]

B:BD[12.2502] → [14.378:428]

                            mgen_data(mon, beha, 0,
                                      a, hitting,

[12.2450]

[15.5660]

                            mgen_data(mon, beha,
                                      0, a, hitting,

Replacement in crawl-ref/source/spells2.cc at line 1449 [13.569242]

B:BD[16.4820] → [17.33897:34057]

            mgen_data(mon, friendly ? BEH_FRIENDLY : BEH_HOSTILE,
                      dur, targ, friendly ? you.pet_target : MHITYOU, 0, god))
        == -1)

[16.4820]

[16.5029]

            mgen_data(mon,
                      friendly ? BEH_FRIENDLY : BEH_HOSTILE,
                      dur, targ,
                      friendly ? you.pet_target : MHITYOU,
                      0, god)) == -1)

Replacement in crawl-ref/source/spells2.cc at line 1474 [13.569242]

B:BD[18.1207] → [19.1816:1911]

            mgen_data(mon, BEH_FRIENDLY, dur, you.pos(),
                      you.pet_target,

[18.1207]

[15.8167]

            mgen_data(mon, BEH_FRIENDLY, dur,
                      you.pos(), you.pet_target,

Replacement in crawl-ref/source/spells2.cc at line 1714 [13.569242]

B:BD[20.2048] → [6.1199:1262]

                          dur, SPELL_TUKIMAS_DANCE, you.pos(),

[20.2048]

[20.2090]

                          dur, SPELL_TUKIMAS_DANCE,
                          you.pos(),

Replacement in crawl-ref/source/spells2.cc at line 1791 [13.569242]

B:BD[20.4057] → [20.4057:4121]

                mgen_data(MONS_BALL_LIGHTNING, BEH_FRIENDLY, 0,

[20.4057]

[21.11552]

                mgen_data(MONS_BALL_LIGHTNING, BEH_FRIENDLY,
                          0, SPELL_CONJURE_BALL_LIGHTNING,

Replacement in crawl-ref/source/religion.cc at line 4712 [13.804403]

B:BD[22.14818] → [23.17567:17622]

        for (int loopy = 0; loopy < how_many; loopy++)

[22.14818]

[13.873506]

        for (int loopy = 0; loopy < how_many; ++loopy)

Replacement in crawl-ref/source/mstuff2.cc at line 110 [13.1340842]

B:BD[24.14144] → [25.2565:2633]

B:BD[25.2633] → [26.2614:2668]

            mgen_data(which_mons, SAME_ATTITUDE(monster), duration,
                      monster->pos(), monster->foe));

[24.14144]

[27.16036]

            mgen_data(which_mons, SAME_ATTITUDE(monster),
                      duration, monster->pos(), monster->foe));

Replacement in crawl-ref/source/mstuff2.cc at line 228 [13.1340842]

B:BD[28.3171] → [25.3164:3233]

B:BD[25.3233] → [6.4185:4235]

∅:D[6.4235] → [26.2728:2786]

B:BD[25.3233] → [26.2728:2786]

                mgen_data(RANDOM_MONSTER, SAME_ATTITUDE(monster), 5,
                          SPELL_SHADOW_CREATURES,
                          monster->pos(), monster->foe));

[28.3171]

[13.1353886]

                mgen_data(RANDOM_MONSTER, SAME_ATTITUDE(monster),
                          5, spell_cast, monster->pos(), monster->foe));

Replacement in crawl-ref/source/mstuff2.cc at line 239 [13.1340842]

B:BD[24.14608] → [25.3299:3372]

B:BD[25.3372] → [26.2787:2845]

                mgen_data(MONS_RAKSHASA_FAKE, SAME_ATTITUDE(monster), 3,
                          monster->pos(), monster->foe));

[24.14608]

[13.1354250]

                mgen_data(MONS_RAKSHASA_FAKE, SAME_ATTITUDE(monster),
                          3, monster->pos(), monster->foe));

Replacement in crawl-ref/source/mstuff2.cc at line 274 [13.1340842]

B:BD[24.14772] → [25.3986:4051]

B:BD[25.4051] → [26.2905:2963]

                mgen_data(mon, SAME_ATTITUDE(monster), duration,
                          monster->pos(), monster->foe));

[24.14772]

[13.1355017]

                mgen_data(mon, SAME_ATTITUDE(monster),
                          duration, monster->pos(), monster->foe));

Replacement in crawl-ref/source/mstuff2.cc at line 293 [13.1340842]

B:BD[25.4311] → [25.4311:4371]

B:BD[25.4371] → [26.3001:3059]

                          SAME_ATTITUDE(monster), duration,
                          monster->pos(), monster->foe));

[25.4311]

[13.1355756]

                          SAME_ATTITUDE(monster),
                          duration, monster->pos(), monster->foe));

Replacement in crawl-ref/source/mstuff2.cc at line 308 [13.1340842]

B:BD[29.2906] → [25.4574:4649]

B:BD[25.4649] → [26.3060:3118]

                mgen_data(MONS_SCORPION, SAME_ATTITUDE(monster), duration,
                          monster->pos(), monster->foe));

[29.2906]

[29.3049]

                mgen_data(MONS_SCORPION, SAME_ATTITUDE(monster),
                          duration, monster->pos(), monster->foe));

Replacement in crawl-ref/source/mstuff2.cc at line 321 [13.1340842]

B:BD[24.15166] → [24.15166:15241]

B:BD[24.15241] → [26.3119:3177]

                mgen_data(MONS_UFETUBUS, SAME_ATTITUDE(monster), duration,
                          monster->pos(), monster->foe));

[24.15166]

[13.1356239]

                mgen_data(MONS_UFETUBUS, SAME_ATTITUDE(monster),
                          duration, monster->pos(), monster->foe));

Replacement in crawl-ref/source/mstuff2.cc at line 328 [13.1340842]

B:BD[28.3675] → [28.3675:3736]

B:BD[28.3736] → [26.3178:3232]

            mgen_data(MONS_BEAST, SAME_ATTITUDE(monster), 4,
                      monster->pos(), monster->foe));

[28.3675]

[13.1356450]

            mgen_data(MONS_BEAST, SAME_ATTITUDE(monster),
                      4, monster->pos(), monster->foe));

Replacement in crawl-ref/source/mstuff2.cc at line 334 [13.1340842]

B:BD[24.15464] → [24.15464:15529]

B:BD[24.15529] → [26.3233:3287]

            mgen_data(MONS_ICE_BEAST, SAME_ATTITUDE(monster), 5,
                      monster->pos(), monster->foe));

[24.15464]

[27.17009]

            mgen_data(MONS_ICE_BEAST, SAME_ATTITUDE(monster),
                      5, monster->pos(), monster->foe));

Replacement in crawl-ref/source/mstuff2.cc at line 368 [13.1340842]

B:BD[30.4187] → [30.4187:4378]

            create_monster(mgen_data(MONS_BALL_LIGHTNING,
                                     SAME_ATTITUDE(monster), 2,
                                     monster->pos(), monster->foe));

[30.4187]

[30.4378]

            create_monster(
                mgen_data(MONS_BALL_LIGHTNING, SAME_ATTITUDE(monster),
                          2, monster->pos(), monster->foe));

Replacement in crawl-ref/source/mstuff2.cc at line 399 [13.1340842]

B:BD[31.8942] → [32.3800:3860]

B:BD[32.3860] → [26.3578:3636]

                          SAME_ATTITUDE(monster), duration,
                          monster->pos(), monster->foe));

[31.8942]

[13.1358310]

                          SAME_ATTITUDE(monster),
                          duration, monster->pos(), monster->foe));

Replacement in crawl-ref/source/mstuff2.cc at line 433 [13.1340842]

B:BD[24.16176] → [24.16176:16253]

B:BD[24.16253] → [26.3637:3699]

                    mgen_data(monsters[i], SAME_ATTITUDE(monster), duration,
                              monster->pos(), monster->foe));

[24.16176]

[33.820]

                    mgen_data(monsters[i], SAME_ATTITUDE(monster),
                              duration, monster->pos(), monster->foe));

Replacement in crawl-ref/source/mstuff2.cc at line 2748 [13.1340842]
B:BD[4.3386] → [4.3386:3410]
```
    switch(summon_type)
```
[4.3386]
[4.3410]
```
    switch (summon_type)
```
Replacement in crawl-ref/source/monplace.h at line 132 [13.1638277]
B:BD[6.11989] → [6.11989:12026]
```
    // mon_summon_type in mon-util.h
```
[6.11989]
[6.12026]
```
    // mon_summon_type in mon-util.h.
```

Replacement in crawl-ref/source/mon-util.h at line 89 [13.1682293]

B:BD[6.13508] → [6.13508:13567]

// the fourth paramater of mgen_data's second constructor.

[6.13508]

[6.13567]

// the fourth parameter of mgen_data's second constructor.

Replacement in crawl-ref/source/mon-util.cc at line 7630 [13.1699344]
∅:D[2.2584] → [34.6894:6951]
B:BD[34.6894] → [34.6894:6951]
```
        const beh_type sbehaviour = SAME_ATTITUDE(this);
```
[2.2584]
[34.6951]
```
        const beh_type beha = SAME_ATTITUDE(this);
```

Replacement in crawl-ref/source/mon-util.cc at line 7639 [13.1699344]

∅:D[35.11912] → [34.7249:7279]

B:BD[34.7249] → [34.7249:7279]

B:BD[34.7279] → [24.42207:42340]

            const int nmons =
                mons_place(
                    mgen_data( jelly, sbehaviour, 0, jpos,
                               foe, true ) );

[35.11912]

[35.11913]

            const int nmons = mons_place(
                                  mgen_data(jelly, beha, 0, 0,
                                            jpos, foe, true));

Replacement in crawl-ref/source/it_use3.cc at line 394 [13.2870456]

B:BD[24.44648] → [36.3548:3595]

B:BD[36.3595] → [37.2640:2687]

            mgen_data(MONS_BEAST, BEH_HOSTILE,
                      4, you.pos(), MHITYOU));

[24.44648]

[38.1606]

            mgen_data::hostile_at(MONS_BEAST,
                you.pos(), 4, 0, true));

Replacement in crawl-ref/source/it_use3.cc at line 408 [13.2870456]

∅:D[39.8349] → [38.1818:1955]

B:BD[38.1818] → [38.1818:1955]

B:BD[38.1955] → [40.18253:18286]

B:BD[40.18286] → [24.44746:44774]

B:BD[24.44774] → [37.2688:2791]

        const monster_type mtype = (one_chance_in(4) ? MONS_FIEND :
                                    summon_any_demon(DEMON_COMMON));
        const bool good_summon =
            create_monster(
                mgen_data(mtype, BEH_HOSTILE,
                          6, you.pos(), MHITYOU)) != -1;

[39.8349]

[38.2173]

        const monster_type mon = (one_chance_in(4) ? MONS_FIEND :
                                     summon_any_demon(DEMON_COMMON));
        const bool good_summon = create_monster(
                                     mgen_data::hostile_at(mon,
                                         you.pos(), 6, 0, true)) != -1;

Replacement in crawl-ref/source/it_use3.cc at line 416 [13.2870456]
B:BD[38.2209] → [38.2209:2246]
```
            if (mtype == MONS_FIEND)
```
[38.2209]
[38.2246]
```
            if (mon == MONS_FIEND)
```
Replacement in crawl-ref/source/it_use3.cc at line 426 [13.2870456]
B:BD[38.2483] → [38.2483:2519]
```
        // Cast a destructive spell
```
[38.2483]
[38.2519]
```
        // Cast a destructive spell.
```

Replacement in crawl-ref/source/it_use3.cc at line 428 [13.2870456]

B:BD[38.2575] → [38.2575:2929]

            random_choose_weighted( 114, SPELL_BOLT_OF_FIRE,
                                    57,  SPELL_LIGHTNING_BOLT,
                                    57,  SPELL_BOLT_OF_DRAINING,
                                    12,  SPELL_HELLFIRE,
                                    0 ));
        your_spells( spl, you.skills[SK_EVOCATIONS] * 8, false );

[38.2575]

[38.2929]

            random_choose_weighted(114, SPELL_BOLT_OF_FIRE,
                                   57,  SPELL_LIGHTNING_BOLT,
                                   57,  SPELL_BOLT_OF_DRAINING,
                                   12,  SPELL_HELLFIRE,
                                   0));
        your_spells(spl, you.skills[SK_EVOCATIONS] * 8, false);

Insertion in crawl-ref/source/it_use3.cc at line 435 [13.2870456]
[38.2935]
[3.2552]

Replacement in crawl-ref/source/it_use3.cc at line 908 [13.2870456]

B:BD[24.45031] → [37.2792:2912]

                mgen_data(MONS_ABOMINATION_SMALL, BEH_HOSTILE,
                          6, you.pos(), MHITYOU)) != -1)

[24.45031]

[13.2897682]

                mgen_data::hostile_at(MONS_ABOMINATION_SMALL,
                    you.pos(), 6, 0, true)) != -1)

Replacement in crawl-ref/source/dungeon.cc at line 4900 [13.3429798]

B:BD[41.465] → [17.84429:84507]

        create_monster(mgen_data::hostile_at( _random_evil_statue(), where));

[41.465]

[41.591]

        create_monster(mgen_data::hostile_at(_random_evil_statue(), where));

Replacement in crawl-ref/source/dungeon.cc at line 6439 [13.3429798]

B:BD[42.43983] → [43.17462:17538]

    mons_place( mgen_data::sleeper_at(MONS_MINOTAUR, end, MG_PATROLLING) );

[42.43983]

[44.20667]

    mons_place(mgen_data::sleeper_at(MONS_MINOTAUR, end, MG_PATROLLING));

Replacement in crawl-ref/source/decks.cc at line 2501 [13.3987460]

B:BD[45.2733] → [45.2733:2845]

                              BEH_FRIENDLY, 5, you.pos(),
                              you.pet_target)) != -1)

[45.2733]

[46.1032]

                              BEH_FRIENDLY, 5,
                              you.pos(), you.pet_target)) != -1)

Replacement in crawl-ref/source/decks.cc at line 2827 [13.3987460]

B:BD[45.3489] → [45.3489:3536]

                      std::min(power / 50, 6),

[45.3489]

[45.3536]

                      std::min(power / 50, 6), 0,

Replacement in crawl-ref/source/decks.cc at line 2829 [13.3987460]

B:BD[45.3569] → [45.3569:3631]

                      friendly ? you.pet_target : MHITYOU ));

[45.3569]

[42.62258]

                      friendly ? you.pet_target : MHITYOU));

Replacement in crawl-ref/source/decks.cc at line 2847 [13.3987460]

B:BD[24.52863] → [24.52863:52915]

            friendly ? you.pet_target : MHITYOU ));

[24.52863]

[47.2998]

            friendly ? you.pet_target : MHITYOU));

Replacement in crawl-ref/source/debug.cc at line 457 [13.4016436]

B:BD[24.53160] → [24.53160:53237]

                static_cast<monster_type>(mon),
                you.pos()));

[24.53160]

[24.53237]

                static_cast<monster_type>(mon), you.pos()));

Replacement in crawl-ref/source/abyss.cc at line 672 [13.4482606]
B:BD[48.15197] → [48.15197:15229]
```
    // Thirty tries for a place
```
[48.15197]
[48.15229]
```
    // Thirty tries for a place.
```

Replacement in crawl-ref/source/abyss.cc at line 691 [13.4482606]

B:BD[49.15719] → [49.15719:15791]

        const int mid = create_monster( mgen_data( mons, beh, 5, p ) );

[49.15719]

[49.15791]

        const int mid = create_monster(mgen_data(mons, beh, 5, 0, p));

Insertion in crawl-ref/source/abyss.cc at line 695 [13.4482606]
[48.16043]
[48.16043]