fiddlerwoaroof/crawl - Change Z7FLGOQODOWQ2FDJRMCNM6MM3FOVORG6BMJZ3AA5HADPNJTYZD2QC

Minor cleanups.

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

Created by haranp on August 1, 2008

Z7FLGOQODOWQ2FDJRMCNM6MM3FOVORG6BMJZ3AA5HADPNJTYZD2QC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spl-cast.cc at line 403 [3.293070]

B:BD[3.301993] → [3.301993:303037]

    if (chance < 45)
        chance2 = 45;
    if (chance < 42)
        chance2 = 43;
    if (chance < 38)
        chance2 = 41;
    if (chance < 35)
        chance2 = 40;
    if (chance < 32)
        chance2 = 38;
    if (chance < 28)
        chance2 = 36;
    if (chance < 22)
        chance2 = 34;
    if (chance < 16)
        chance2 = 32;
    if (chance < 10)
        chance2 = 30;
    if (chance < 2)
        chance2 = 28;
    if (chance < -7)
        chance2 = 26;
    if (chance < -12)
        chance2 = 24;
    if (chance < -18)
        chance2 = 22;
    if (chance < -24)
        chance2 = 20;
    if (chance < -30)
        chance2 = 18;
    if (chance < -38)
        chance2 = 16;
    if (chance < -46)
        chance2 = 14;
    if (chance < -60)
        chance2 = 12;
    if (chance < -80)
        chance2 = 10;
    if (chance < -100)
        chance2 = 8;
    if (chance < -120)
        chance2 = 6;
    if (chance < -140)
        chance2 = 4;
    if (chance < -160)
        chance2 = 2;
    if (chance < -180)
        chance2 = 0;

[3.301993]

[3.303037]

    const int chance_breaks[][2] = {
        {45, 45}, {42, 43}, {38, 41}, {35, 40}, {32, 38}, {28, 36},
        {22, 34}, {16, 32}, {10, 30}, {2, 28}, {-7, 26}, {-12, 24},
        {-18, 22}, {-24, 20}, {-30, 18}, {-38, 16}, {-46, 14},
        {-60, 12}, {-80, 10}, {-100, 8}, {-120, 6}, {-140, 4},
        {-160, 2}, {-180, 0}
    };
    for ( unsigned int i = 0; i < ARRAYSZ(chance_breaks); ++i )
        if ( chance < chance_breaks[i][0] )
            chance2 = chance_breaks[i][1];

Deletion in crawl-ref/source/spells2.cc at line 239 [3.569242]
B:BD[3.573392] → [3.573392:573393]
B:BD[3.573393] → [2.32444:32478]
∅:D[2.32478] → [3.573429:573430]
B:BD[3.573429] → [3.573429:573430]
B:BD[3.573430] → [2.32479:32643]
∅:D[2.32643] → [3.573592:573619]
B:BD[3.573592] → [3.573592:573619]
B:BD[3.573619] → [2.32644:32708]
∅:D[2.32708] → [3.573679:573704]
B:BD[3.573679] → [3.573679:573704]
```
    int adx = 0;
    int ady = 0;
    int minx = you.pos().x - 6;
    int maxx = you.pos().x + 7;
    int miny = you.pos().y - 6;
    int maxy = you.pos().y + 7;
    int xinc = 1;
    int yinc = 1;
    if (coinflip())
    {
        minx = you.pos().x + 6;
        maxx = you.pos().x - 7;
        xinc = -1;
    }
```
Replacement in crawl-ref/source/spells2.cc at line 240 [3.569242]
B:BD[3.573705] → [3.573705:573725]
```
    if (coinflip())
```
[3.573705]
[3.573725]
```
    for (radius_iterator ri(you.pos(), 6); ri; ++ri)
```

Replacement in crawl-ref/source/spells2.cc at line 242 [3.569242]

B:BD[3.573731] → [2.32709:32773]

∅:D[2.32773] → [3.573791:573864]

B:BD[3.573791] → [3.573791:573864]

B:BD[3.573928] → [3.573928:573979]

        miny = you.pos().y + 6;
        maxy = you.pos().y - 7;
        yinc = -1;
    }
    for (adx = minx; adx != maxx; adx += xinc)
        for (ady = miny; ady != maxy; ady += yinc)

[3.573731]

[3.573979]

        if (see_grid_no_trans(*ri) && !is_sanctuary(*ri)
            && env.cgrid(*ri) == EMPTY_CLOUD)

Replacement in crawl-ref/source/spells2.cc at line 245 [3.569242]

B:BD[3.573989] → [4.10557:10653]

            coord_def ad(adx, ady);
            if (see_grid_no_trans(ad) && !is_sanctuary(ad))

[3.573989]

[3.574025]

            for ( stack_iterator si(*ri); si; ++si )

Replacement in crawl-ref/source/spells2.cc at line 247 [3.569242]
B:BD[3.574039] → [2.32774:32824]
∅:D[4.10728] → [3.574163:574193]
∅:D[2.32824] → [3.574163:574193]
B:BD[3.574163] → [3.574163:574193]
B:BD[3.574284] → [3.574284:574285]
B:BD[3.574285] → [4.10729:10785]
```
                if (env.cgrid(ad) != EMPTY_CLOUD)
                    continue;
                for ( stack_iterator si(ad); si; ++si )
```
[3.574039]
[3.574326]
```
                if (si->base_type == OBJ_CORPSES && si->sub_type == CORPSE_BODY)
```

Replacement in crawl-ref/source/spells2.cc at line 249 [3.569242]

B:BD[3.574344] → [4.10786:10895]

∅:D[4.10895] → [3.574467:574489]

B:BD[3.574467] → [3.574467:574489]

B:BD[3.574489] → [4.10896:11074]

∅:D[4.11074] → [3.574598:574627]

B:BD[3.574598] → [3.574598:574627]

B:BD[3.574627] → [4.11075:11135]

∅:D[5.392] → [3.574859:574860]

∅:D[4.11135] → [3.574859:574860]

B:BD[3.574859] → [3.574859:574860]

B:BD[3.574860] → [4.11136:11190]

∅:D[4.11190] → [6.4274:4342]

B:BD[3.574920] → [6.4274:4342]

∅:D[6.4342] → [3.574980:574981]

B:BD[3.574980] → [3.574980:574981]

B:BD[3.574981] → [7.3318:3379]

∅:D[7.3379] → [8.1009:1040]

B:BD[8.1009] → [8.1009:1040]

∅:D[8.1040] → [3.575024:575046]

B:BD[3.575024] → [3.575024:575046]

                    if (si->base_type == OBJ_CORPSES
                        && si->sub_type == CORPSE_BODY)
                    {
                        // Found a corpse. Skeletify it if possible.
                        if (!mons_skeleton(si->plus))
                            destroy_item(si->index());
                        else
                            turn_corpse_into_skeleton(*si);
                        place_cloud(CLOUD_MIASMA, ad,
                                    4 + random2avg(16, 3), KC_YOU);
                        // Don't look for more corpses here.
                        break;
                    }

[3.574344]

[3.575121]

                    // Found a corpse. Skeletify it if possible.
                    if (!mons_skeleton(si->plus))
                        destroy_item(si->index());
                    else
                        turn_corpse_into_skeleton(*si);
                    
                    place_cloud(CLOUD_MIASMA, *ri, 4+random2avg(16, 3), KC_YOU);
                    
                    // Don't look for more corpses here.
                    break;

Insertion in crawl-ref/source/spells2.cc at line 262 [3.569242]
[3.575218]
[3.575224]
```
    }
```
Replacement in crawl-ref/source/spells2.cc at line 270 [3.569242]
B:BD[3.575401] → [3.575401:575453]
```
}                               // end corpse_rot()
```
[3.575401]
[3.575881]
```
}
```
Deletion in crawl-ref/source/spells2.cc at line 479 [3.569242]
B:BD[3.587215] → [3.587215:587246]
```
    struct monsters *monster;
```
Replacement in crawl-ref/source/spells2.cc at line 481 [3.569242]
B:BD[3.587292] → [3.587292:587338]
```
    for (int tu = 0; tu < MAX_MONSTERS; tu++)
```
[3.587292]
[3.587338]
```
    for (int i = 0; i < MAX_MONSTERS; i++)
```
Replacement in crawl-ref/source/spells2.cc at line 483 [3.569242]
B:BD[3.587344] → [3.587344:587373]
```
        monster = &menv[tu];
```
[3.587344]
[3.587373]
```
        monsters* const monster = &menv[i];
```

Replacement in crawl-ref/source/spells2.cc at line 645 [3.569242]

B:BD[3.590977] → [3.590977:591168]

    struct monsters *monster = 0;       // NULL {dlb}
    int hurted = 0;
    struct bolt beam;
    int toxy;
    beam.flavour = BEAM_COLD;
    const dice_def  dam_dice( 3, 5 + pow / 10 );

[3.590977]

[3.591168]

    const dice_def dam_dice( 3, 5 + pow / 10 );

Replacement in crawl-ref/source/spells2.cc at line 654 [3.569242]

B:BD[3.591307] → [3.591307:591422]

    // Do the player:
    hurted = roll_dice( dam_dice );
    hurted = check_your_resists( hurted, beam.flavour );

[3.591307]

[3.591422]

    // Handle the player.
    const int hurted = check_your_resists(roll_dice( dam_dice ), BEAM_COLD);

Replacement in crawl-ref/source/spells2.cc at line 669 [3.569242]

B:BD[3.591789] → [3.591789:591837]

    for (toxy = 0; toxy < MAX_MONSTERS; toxy++)

[3.591789]

[3.591837]

    bolt beam;   
    beam.flavour = BEAM_COLD;
    beam.thrower = KILL_YOU;
    for (int i = 0; i < MAX_MONSTERS; i++)

Replacement in crawl-ref/source/spells2.cc at line 674 [3.569242]
B:BD[3.591843] → [3.591843:591874]
```
        monster = &menv[toxy];
```
[3.591843]
[3.591874]
```
        monsters* const monster = &menv[i];
```

Replacement in crawl-ref/source/spells2.cc at line 684 [3.569242]

B:BD[3.592117] → [3.592117:592230]

            hurted = roll_dice( dam_dice );
            hurted = mons_adjust_flavoured( monster, beam, hurted );

[3.592117]

[3.592230]

            int hurt = mons_adjust_flavoured(monster,beam,roll_dice(dam_dice));

Replacement in crawl-ref/source/spells2.cc at line 686 [3.569242]
B:BD[3.592231] → [3.592231:592259]
```
            if (hurted > 0)
```
[3.592231]
[3.592259]
```
            if (hurt > 0)
```

Replacement in crawl-ref/source/spells2.cc at line 688 [3.569242]

B:BD[3.592273] → [3.592273:592322]

                hurt_monster( monster, hurted );

[3.592273]

[3.592322]

                hurt_monster( monster, hurt );

Replacement in crawl-ref/source/spells2.cc at line 693 [3.569242]

B:BD[3.592444] → [3.592444:592462]

B:BD[3.592462] → [9.414:536]

                {
                    const monsters *mons = static_cast<const monsters*>(monster);
                    print_wounds(mons);

[3.592444]

[3.592505]

                {                    
                    print_wounds(monster);

Replacement in crawl-ref/source/spells2.cc at line 696 [3.569242]

B:BD[3.592506] → [3.592506:592565]

B:BD[3.592565] → [10.151788:151874]

                    //jmf: "slow snakes" finally available
                    if (mons_class_flag( monster->type, M_COLD_BLOOD ) && coinflip())

[3.592506]

[11.4064]

                    if (mons_class_flag(monster->type, M_COLD_BLOOD)
                        && coinflip())
                    {

Insertion in crawl-ref/source/spells2.cc at line 700 [3.569242]
[11.4118]
[3.592704]
```
                    }
```
Replacement in crawl-ref/source/spells2.cc at line 705 [3.569242]
B:BD[3.592752] → [3.592752:592812]
```
}                               // end cast_refrigeration()
```
[3.592752]
[3.592812]
```
}
```

Deletion in crawl-ref/source/spells2.cc at line 709 [3.569242]

B:BD[3.592840] → [3.592840:592936]

    int hp_gain = 0;
    int hurted = 0;
    struct monsters *monster = 0;       // NULL {dlb}

Replacement in crawl-ref/source/spells2.cc at line 721 [3.569242]

B:BD[3.593269] → [3.593269:593321]

    for (int toxy = 0; toxy < MAX_MONSTERS; toxy++)

[3.593269]

[3.593321]

    int hp_gain = 0;
    for (int i = 0; i < MAX_MONSTERS; i++)

Replacement in crawl-ref/source/spells2.cc at line 725 [3.569242]
B:BD[3.593327] → [3.593327:593358]
```
        monster = &menv[toxy];
```
[3.593327]
[3.593358]
```
        monsters* monster = &menv[i];
```
Replacement in crawl-ref/source/spells2.cc at line 741 [3.569242]
B:BD[3.593778] → [3.593778:593830]
B:BD[3.593830] → [12.281:282]
```
            hurted = 3 + random2(7) + random2(pow);
```
[3.593778]
[4.11222]
```
            const int hurted = 3 + random2(7) + random2(pow);
```
Deletion in crawl-ref/source/spells2.cc at line 743 [3.569242]
∅:D[12.361] → [3.593830:593831]
∅:D[4.11290] → [3.593830:593831]
B:BD[3.593830] → [3.593830:593831]
Deletion in crawl-ref/source/spells2.cc at line 744 [3.569242]
∅:D[13.1263] → [3.593874:593875]
B:BD[3.593874] → [3.593874:593875]

Replacement in crawl-ref/source/fight.cc at line 3425 [3.3140790]

B:BD[14.841] → [14.841:971]

B:BD[14.971] → [15.6118:6176]

            int dx = abs(attacker->pos().x - defender->pos().x);
            int dy = abs(attacker->pos().y - defender->pos().y);
            if (dx == 2 && dy <= 2 || dy == 2 && dx <= 2)

[14.841]

[14.1033]

            if ( grid_distance(attacker->pos(), defender->pos()) == 2 )

Minor cleanups.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/spl-cast.cc at line 403 [3.293070]

Deletion in crawl-ref/source/spells2.cc at line 239 [3.569242]

Replacement in crawl-ref/source/spells2.cc at line 240 [3.569242]

Replacement in crawl-ref/source/spells2.cc at line 242 [3.569242]

Replacement in crawl-ref/source/spells2.cc at line 245 [3.569242]

Replacement in crawl-ref/source/spells2.cc at line 247 [3.569242]

Replacement in crawl-ref/source/spells2.cc at line 249 [3.569242]

Insertion in crawl-ref/source/spells2.cc at line 262 [3.569242]

Replacement in crawl-ref/source/spells2.cc at line 270 [3.569242]

Deletion in crawl-ref/source/spells2.cc at line 479 [3.569242]

Replacement in crawl-ref/source/spells2.cc at line 481 [3.569242]

Replacement in crawl-ref/source/spells2.cc at line 483 [3.569242]

Replacement in crawl-ref/source/spells2.cc at line 645 [3.569242]

Replacement in crawl-ref/source/spells2.cc at line 654 [3.569242]

Replacement in crawl-ref/source/spells2.cc at line 669 [3.569242]

Replacement in crawl-ref/source/spells2.cc at line 674 [3.569242]

Replacement in crawl-ref/source/spells2.cc at line 684 [3.569242]

Replacement in crawl-ref/source/spells2.cc at line 686 [3.569242]

Replacement in crawl-ref/source/spells2.cc at line 688 [3.569242]

Replacement in crawl-ref/source/spells2.cc at line 693 [3.569242]

Replacement in crawl-ref/source/spells2.cc at line 696 [3.569242]

Insertion in crawl-ref/source/spells2.cc at line 700 [3.569242]

Replacement in crawl-ref/source/spells2.cc at line 705 [3.569242]

Deletion in crawl-ref/source/spells2.cc at line 709 [3.569242]

Replacement in crawl-ref/source/spells2.cc at line 721 [3.569242]

Replacement in crawl-ref/source/spells2.cc at line 725 [3.569242]

Replacement in crawl-ref/source/spells2.cc at line 741 [3.569242]

Deletion in crawl-ref/source/spells2.cc at line 743 [3.569242]

Deletion in crawl-ref/source/spells2.cc at line 744 [3.569242]

Replacement in crawl-ref/source/fight.cc at line 3425 [3.3140790]