fiddlerwoaroof/crawl - Change 5DMO2DEV7IK3MJG274EUNZBGQ7EBZWC2WTSKAEGPDMILX7BXYG3AC

Add minor cosmetic fixes.

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

Created by dolorous on June 19, 2008

5DMO2DEV7IK3MJG274EUNZBGQ7EBZWC2WTSKAEGPDMILX7BXYG3AC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/mstuff2.cc at line 1576 [4.1340842]
∅:D[3.4660] → [4.1374407:1374453]
B:BD[4.1374407] → [4.1374407:1374453]
```
void spore_goes_pop(struct monsters *monster)
```
[3.4660]
[4.1374453]
```
void spore_goes_pop(monsters *monster)
```

Replacement in crawl-ref/source/beam.h at line 179 [4.4124541]

B:BD[4.4125082] → [2.2760:2838]

void fire_beam( bolt &pbolt, item_def *item = NULL, bool drop_item = false );

[4.4125082]

[4.4125143]

void fire_beam(bolt &pbolt, item_def *item = NULL, bool drop_item = false);

Replacement in crawl-ref/source/beam.h at line 196 [4.4124541]

B:BD[4.4126000] → [5.6669:6735]

∅:D[5.6735] → [4.4126073:4126146]

B:BD[4.4126073] → [4.4126073:4126146]

int mons_adjust_flavoured( monsters *monster, struct bolt &pbolt,
                           int hurted, bool doFlavouredEffects = true );

[4.4126000]

[4.4126146]

int mons_adjust_flavoured(monsters *monster, bolt &pbolt, int hurted,
                          bool doFlavouredEffects = true);

Deletion in crawl-ref/source/beam.cc at line 1746 [4.4128068]
B:BD[4.4169425] → [4.4169425:4169426]

Replacement in crawl-ref/source/beam.cc at line 1747 [4.4128068]

B:BD[4.4169427] → [6.2992:3054]

void fire_beam( bolt &pbolt, item_def *item, bool drop_item )

[4.4169427]

[4.4169480]

void fire_beam(bolt &pbolt, item_def *item, bool drop_item)

Deletion in crawl-ref/source/beam.cc at line 1875 [4.4128068]
B:BD[7.559] → [8.40904:40926]
```
                    {
```
Deletion in crawl-ref/source/beam.cc at line 1876 [4.4128068]
B:BD[7.598] → [8.40927:40949]
```
                    }
```

Replacement in crawl-ref/source/beam.cc at line 1881 [4.4128068]

B:BD[8.40990] → [8.40990:41100]

                while ( rangeRemaining > 0
                        && grid_is_solid(grd[ray.x()][ray.y()]) );

[8.40990]

[4.4174718]

                while (rangeRemaining > 0
                        && grid_is_solid(grd[ray.x()][ray.y()]));

Replacement in crawl-ref/source/beam.cc at line 1933 [4.4128068]
∅:D[9.31235] → [4.4176822:4176851]
B:BD[4.4176822] → [4.4176822:4176851]
```
        rangeRemaining -= 1;
```
[9.31235]
[4.4176851]
```
        rangeRemaining--;
```
Replacement in crawl-ref/source/beam.cc at line 2000 [4.4128068]
∅:D[6.3088] → [4.4178637:4178686]
B:BD[4.4178637] → [4.4178637:4178686]
```
        beam_drop_object( pbolt, item, tx, ty );
```
[6.3082]
[10.14481]
```
        beam_drop_object(pbolt, item, tx, ty);
```

Replacement in crawl-ref/source/beam.cc at line 2055 [4.4128068]

B:BD[4.4179660] → [11.1987:2046]

∅:D[11.2046] → [4.4179733:4179798]

B:BD[4.4179733] → [4.4179733:4179798]

int mons_adjust_flavoured( monsters *monster, bolt &pbolt,
                           int hurted, bool doFlavouredEffects )

[4.4179660]

[4.4179798]

int mons_adjust_flavoured(monsters *monster, bolt &pbolt, int hurted,
                          bool doFlavouredEffects)

Replacement in crawl-ref/source/beam.cc at line 3518 [4.4128068]
B:BD[4.4221999] → [12.17333:17379]
```
static void _beam_ouch( int dam, bolt &beam )
```
[4.4221999]
[4.4222051]
```
static void _beam_ouch(int dam, bolt &beam)
```

Replacement in crawl-ref/source/beam.cc at line 3521 [4.4128068]

B:BD[4.4222092] → [13.1241191:1241252]

    if (YOU_KILL( beam.thrower ) && beam.aux_source.empty())

[4.4222092]

[4.4222146]

    if (YOU_KILL(beam.thrower) && beam.aux_source.empty())

Replacement in crawl-ref/source/beam.cc at line 3523 [4.4128068]
B:BD[4.4222152] → [4.4222152:4222198]
```
        ouch( dam, 0, KILLED_BY_TARGETTING );
```
[4.4222152]
[4.4222198]
```
        ouch(dam, 0, KILLED_BY_TARGETTING);
```
Replacement in crawl-ref/source/beam.cc at line 3525 [4.4128068]
B:BD[4.4222204] → [4.4222204:4222243]
```
    else if (MON_KILL( beam.thrower ))
```
[4.4222204]
[4.4222243]
```
    else if (MON_KILL(beam.thrower))
```

Replacement in crawl-ref/source/beam.cc at line 3528 [4.4128068]

B:BD[4.4222289] → [4.4222289:4222349]

            ouch( dam, beam.beam_source, KILLED_BY_SPORE );

[4.4222289]

[4.4222349]

            ouch(dam, beam.beam_source, KILLED_BY_SPORE);

Replacement in crawl-ref/source/beam.cc at line 3531 [4.4128068]

∅:D[14.4194] → [10.15120:15177]

B:BD[4.4222362] → [10.15120:15177]

∅:D[10.15177] → [13.1241311:1241356]

B:BD[13.1241311] → [13.1241311:1241356]

            ouch( dam, beam.beam_source, KILLED_BY_BEAM,
                  beam.aux_source.c_str() );

[14.4194]

[14.4195]

            ouch(dam, beam.beam_source, KILLED_BY_BEAM,
                 beam.aux_source.c_str());

Add minor cosmetic fixes.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/mstuff2.cc at line 1576 [4.1340842]

Replacement in crawl-ref/source/beam.h at line 179 [4.4124541]

Replacement in crawl-ref/source/beam.h at line 196 [4.4124541]

Deletion in crawl-ref/source/beam.cc at line 1746 [4.4128068]

Replacement in crawl-ref/source/beam.cc at line 1747 [4.4128068]

Deletion in crawl-ref/source/beam.cc at line 1875 [4.4128068]

Deletion in crawl-ref/source/beam.cc at line 1876 [4.4128068]

Replacement in crawl-ref/source/beam.cc at line 1881 [4.4128068]

Replacement in crawl-ref/source/beam.cc at line 1933 [4.4128068]

Replacement in crawl-ref/source/beam.cc at line 2000 [4.4128068]

Replacement in crawl-ref/source/beam.cc at line 2055 [4.4128068]

Replacement in crawl-ref/source/beam.cc at line 3518 [4.4128068]

Replacement in crawl-ref/source/beam.cc at line 3521 [4.4128068]

Replacement in crawl-ref/source/beam.cc at line 3523 [4.4128068]

Replacement in crawl-ref/source/beam.cc at line 3525 [4.4128068]

Replacement in crawl-ref/source/beam.cc at line 3528 [4.4128068]

Replacement in crawl-ref/source/beam.cc at line 3531 [4.4128068]