fiddlerwoaroof/crawl - Change T47W6FG7GCHCFEWR6MPVLDYVYG7Y4U4F3VY3FXKJNXV5R7HH544QC

Add more miscellaneous minor cleanups.

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

Created by dolorous on June 10, 2008

T47W6FG7GCHCFEWR6MPVLDYVYG7Y4U4F3VY3FXKJNXV5R7HH544QC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/spells4.h at line 50 [6.434549]
B:BD[6.435877] → [7.142586:142624]
```
void cast_chain_lightning( int pow );
```

Replacement in crawl-ref/source/spells1.h at line 88 [6.611815]

B:BD[6.614299] → [8.7925:7968]

int cast_fire_storm(int powc, bolt &beam);

[6.614299]

[3.170]

void cast_fire_storm(int pow, bolt &beam);
void cast_chain_lightning(int pow);

Replacement in crawl-ref/source/spells1.h at line 95 [6.611815]
B:BD[6.614484] → [9.3953:3991]
```
bool fireball(int power, bolt &beam);
```
[6.614484]
[5.2133]
```
bool fireball(int pow, bolt &beam);
```
Replacement in crawl-ref/source/spells1.cc at line 173 [6.616635]
B:BD[6.619504] → [6.619504:619545]
```
            you.redraw_armour_class = 1;
```
[6.619504]
[6.619545]
```
            you.redraw_armour_class = true;
```
Replacement in crawl-ref/source/spells1.cc at line 235 [6.616635]
B:BD[6.620844] → [6.620844:620881]
```
        you.redraw_armour_class = 1;
```
[6.620844]
[6.620881]
```
        you.redraw_armour_class = true;
```
Replacement in crawl-ref/source/spells1.cc at line 239 [6.616635]
B:BD[6.620900] → [6.620900:620954]
```
}                               // end random_blink()
```
[6.620900]
[6.620954]
```
}
```
Replacement in crawl-ref/source/spells1.cc at line 241 [6.616635]
B:BD[6.620955] → [9.3993:4030]
```
bool fireball(int power, bolt &beam)
```
[6.620955]
[6.620980]
```
bool fireball(int pow, bolt &beam)
```
Replacement in crawl-ref/source/spells1.cc at line 243 [6.616635]
B:BD[6.620982] → [9.4031:4126]
∅:D[9.4126] → [6.621459:621509]
∅:D[7.153297] → [6.621459:621509]
B:BD[6.621459] → [6.621459:621509]
```
    if (!zapping(ZAP_FIREBALL, power, beam, true))
        return (false);
    return (true);
}                               // end fireball()
```
[6.620982]
[6.621509]
```
    return (zapping(ZAP_FIREBALL, pow, beam, true));
}
```
Replacement in crawl-ref/source/spells1.cc at line 246 [6.616635]
B:BD[6.621510] → [8.8127:8169]
```
int cast_fire_storm(int powc, bolt &beam)
```
[6.621510]
[6.621541]
```
void cast_fire_storm(int pow, bolt &beam)
```
Replacement in crawl-ref/source/spells1.cc at line 249 [6.616635]
B:BD[9.4174] → [9.4174:4224]
```
    beam.ex_size      = 2 + (random2(powc) > 75);
```
[9.4174]
[9.4224]
```
    beam.ex_size      = 2 + (random2(pow) > 75);
```

Replacement in crawl-ref/source/spells1.cc at line 260 [6.616635]

B:BD[7.153607] → [9.4481:4625]

    beam.ench_power   = powc;     // used for radius
    beam.hit          = 20 + powc / 10;
    beam.damage       = calc_dice( 9, 20 + powc );

[7.153607]

[6.622290]

    beam.ench_power   = pow;      // used for radius
    beam.hit          = 20 + pow / 10;
    beam.damage       = calc_dice(9, 20 + pow);

Replacement in crawl-ref/source/spells1.cc at line 264 [6.616635]

B:BD[6.622291] → [10.171:227]

    explosion( beam, false, false, true, true, false );

[6.622291]

[6.622314]

    explosion(beam, false, false, true, true, false);

Replacement in crawl-ref/source/spells1.cc at line 268 [6.616635]
B:BD[6.622385] → [7.153648:153665]
∅:D[7.153665] → [6.622385:622442]
B:BD[6.622385] → [6.622385:622442]
B:BD[6.622442] → [7.153666:153667]
```
    return (1);
}                               // end cast_fire_storm()
```
[6.622385]
[7.153667]
```
}
```
Replacement in crawl-ref/source/spells1.cc at line 270 [6.616635]
B:BD[7.153668] → [7.153668:153706]
```
void cast_chain_lightning( int powc )
```
[7.153668]
[7.153706]
```
void cast_chain_lightning(int pow)
```
Replacement in crawl-ref/source/spells1.cc at line 272 [6.616635]
B:BD[7.153708] → [7.153708:153730]
```
    struct bolt beam;
```
[7.153708]
[7.153730]
```
    bolt beam;
```
Replacement in crawl-ref/source/spells1.cc at line 294 [6.616635]
B:BD[11.214] → [11.214:233]
∅:D[11.233] → [7.154316:154368]
B:BD[7.154316] → [7.154316:154368]
```
         powc > 0;
         powc -= 8 + random2(13), sx = tx, sy = ty)
```
[11.214]
[7.154368]
```
         pow > 0;
         pow -= 8 + random2(13), sx = tx, sy = ty)
```

Replacement in crawl-ref/source/spells1.cc at line 344 [6.616635]

B:BD[7.155717] → [7.155717:155774]

            else if (tx == -1 || one_chance_in( count ))

[7.155717]

[7.155774]

            else if (tx == -1 || one_chance_in(count))

Replacement in crawl-ref/source/spells1.cc at line 351 [6.616635]

B:BD[7.156008] → [7.156008:156082]

                if (dist < min_dist)
                    min_dist = dist;

[7.156008]

[7.156082]

                dist = std::max(dist, min_dist);

Replacement in crawl-ref/source/spells1.cc at line 356 [6.616635]
∅:D[4.218] → [7.156155:156217]
B:BD[7.156155] → [7.156155:156217]
```
        dist = grid_distance( sx, sy, you.x_pos, you.y_pos );
```
[4.218]
[7.156217]
```
        dist = grid_distance(sx, sy, you.x_pos, you.y_pos);
```

Replacement in crawl-ref/source/spells1.cc at line 366 [6.616635]

B:BD[7.156503] → [7.156503:156648]

                    || (dist == min_dist && one_chance_in( count + 1 )))
                && check_line_of_sight( sx, sy, you.x_pos, you.y_pos ))

[7.156503]

[7.156648]

                    || (dist == min_dist && one_chance_in(count + 1)))
                && check_line_of_sight(sx, sy, you.x_pos, you.y_pos))

Replacement in crawl-ref/source/spells1.cc at line 380 [6.616635]

B:BD[7.156916] → [7.156916:156969]

                mpr( "The lightning grounds out." );

[7.156916]

[7.156969]

                mpr("The lightning grounds out.");

Replacement in crawl-ref/source/spells1.cc at line 391 [6.616635]

B:BD[7.157272] → [7.157272:157340]

            mpr( "The lightning arcs out of your line of sight!" );

[7.157272]

[7.157340]

            mpr("The lightning arcs out of your line of sight!");

Replacement in crawl-ref/source/spells1.cc at line 393 [6.616635]

B:BD[7.157382] → [7.157382:157440]

            mpr( "The lightning arc suddenly appears!" );

[7.157382]

[7.157440]

            mpr("The lightning arc suddenly appears!");

Replacement in crawl-ref/source/spells1.cc at line 398 [6.616635]
B:BD[7.157539] → [7.157539:157572]
```
            powc = powc / 2 + 1;
```
[7.157539]
[7.157572]
```
            pow = pow / 2 + 1;
```

Replacement in crawl-ref/source/spells1.cc at line 406 [6.616635]

B:BD[7.157728] → [7.157728:157785]

        beam.damage = calc_dice( 5, 12 + powc * 2 / 3 );

[7.157728]

[7.157785]

        beam.damage = calc_dice(5, 12 + pow * 2 / 3);

Replacement in crawl-ref/source/spells1.cc at line 1426 [6.616635]
B:BD[6.636432] → [6.636432:636469]
```
        you.redraw_armour_class = 1;
```
[6.636432]
[11.408]
```
        you.redraw_armour_class = true;
```

Replacement in crawl-ref/source/spells1.cc at line 1454 [6.616635]

B:BD[6.637215] → [6.637215:637284]

        you.redraw_evasion = 1;
        you.redraw_armour_class = 1;

[6.637215]

[2.181]

        you.redraw_evasion = true;
        you.redraw_armour_class = true;

Add more miscellaneous minor cleanups.

Dependencies

In channels

Change contents

Deletion in crawl-ref/source/spells4.h at line 50 [6.434549]

Replacement in crawl-ref/source/spells1.h at line 88 [6.611815]

Replacement in crawl-ref/source/spells1.h at line 95 [6.611815]

Replacement in crawl-ref/source/spells1.cc at line 173 [6.616635]

Replacement in crawl-ref/source/spells1.cc at line 235 [6.616635]

Replacement in crawl-ref/source/spells1.cc at line 239 [6.616635]

Replacement in crawl-ref/source/spells1.cc at line 241 [6.616635]

Replacement in crawl-ref/source/spells1.cc at line 243 [6.616635]

Replacement in crawl-ref/source/spells1.cc at line 246 [6.616635]

Replacement in crawl-ref/source/spells1.cc at line 249 [6.616635]

Replacement in crawl-ref/source/spells1.cc at line 260 [6.616635]

Replacement in crawl-ref/source/spells1.cc at line 264 [6.616635]

Replacement in crawl-ref/source/spells1.cc at line 268 [6.616635]

Replacement in crawl-ref/source/spells1.cc at line 270 [6.616635]

Replacement in crawl-ref/source/spells1.cc at line 272 [6.616635]

Replacement in crawl-ref/source/spells1.cc at line 294 [6.616635]