fiddlerwoaroof/crawl - Change G5FU72S2CVOOCVFOKCRQKXDVKPEI3B6JOUTWLKAJVUBCTWC7OG6QC

Add minor cosmetic fixes.

Created by David Lawrence Ramsey on October 16, 2009

G5FU72S2CVOOCVFOKCRQKXDVKPEI3B6JOUTWLKAJVUBCTWC7OG6QC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spells4.cc at line 1985 [4.436250]
B:BD[3.5699] → [2.181:193]
```
    if(res)
```
[3.5699]
[2.193]
```
    if (res)
```

Replacement in crawl-ref/source/spells3.cc at line 1506 [4.531613]

B:BD[5.6188] → [6.694:758]

             "Scattered target square (%d,%d)", pos.x, pos.y );

[5.6188]

[4.550555]

             "Scattered target square (%d, %d)", pos.x, pos.y);

Replacement in crawl-ref/source/spells1.cc at line 237 [4.616635]

B:BD[4.620485] → [2.872:1204]

        // Going to assume that move_player_to_grid works, (it should
        // because terrain type etc. was already checked). could result
        // in awkward messaging if it cancels for some reason but it's
        // probably better than getting the blink message after any Mf
        // transform messages all the time -cao

[4.620485]

        // Going to assume that move_player_to_grid() works.  (It should
        // because terrain type, etc. was already checked.)  This could
        // result in awkward messaging if it cancels for some reason,
        // but it's probably better than getting the blink message after
        // any Mf transform messages all the time. -cao

Replacement in crawl-ref/source/spells1.cc at line 245 [4.616635]
B:BD[2.1309] → [2.1309:1329]
```
        if(success)
```
[2.1309]
[2.1329]
```
        if (success)
```

Replacement in crawl-ref/source/spells1.cc at line 1448 [4.616635]

B:BD[2.1661] → [2.1661:1806]

        // Merfolk boots unmeld if flight takes us out of water
        if(you.species == SP_MERFOLK && grid_is_water(grd(you.pos())))
        {

[2.1661]

[2.1806]

        // Merfolk boots unmeld if flight takes us out of water.
        if (you.species == SP_MERFOLK && grid_is_water(grd(you.pos())))

Deletion in crawl-ref/source/spells1.cc at line 1451 [4.616635]
B:BD[2.1846] → [2.1846:1857]
```
        }
```

Replacement in crawl-ref/source/it_use2.cc at line 3 [4.2904329]

B:BD[4.2904360] → [4.2904360:2904442]

 *  Summary:    Functions for using wands, potions, and weapon/armour removal.4\3

[4.2904360]

[4.2904442]

 *  Summary:    Functions for using wands, potions, and weapon/armour removal.

Replacement in crawl-ref/source/it_use2.cc at line 248 [4.2904329]

B:BD[7.4310] → [2.4682:4857]

        // Merfolk boots unmeld if levitation takes us out of water
        if(!player_is_airborne() && you.species == SP_MERFOLK
           && grid_is_water(grd(you.pos())))

[7.4310]

[2.4857]

        // Merfolk boots unmeld if levitation takes us out of water.
        if (!player_is_airborne() && you.species == SP_MERFOLK
            && grid_is_water(grd(you.pos())))

Replacement in crawl-ref/source/dungeon.cc at line 3665 [4.3429798]

B:BD[8.74978] → [8.74978:75036]

    for ( int tries = 0; tries < 100 && !is_ok; ++tries )

[8.74978]

[4.3584369]

    for (int tries = 0; tries < 100 && !is_ok; ++tries)

Replacement in crawl-ref/source/dungeon.cc at line 3674 [4.3429798]

B:BD[8.75177] → [8.75177:75243]

            c.set( random_range(sr.tl.x, sr.br.x - 1), sr.tl.y );

[8.75177]

[8.75243]

            c.set(random_range(sr.tl.x, sr.br.x - 1), sr.tl.y);

Replacement in crawl-ref/source/dungeon.cc at line 3679 [4.3429798]

B:BD[8.75347] → [8.75347:75443]

            c.set( random_range(sr.tl.x, sr.br.x - 1), sr.br.y );
            delta.set(0,  1);

[8.75347]

[8.75443]

            c.set(random_range(sr.tl.x, sr.br.x - 1), sr.br.y);
            delta.set(0, 1);

Replacement in crawl-ref/source/dungeon.cc at line 3684 [4.3429798]

B:BD[8.75516] → [8.75516:75582]

            c.set( sr.tl.x, random_range(sr.tl.y, sr.br.y - 1) );

[8.75516]

[8.75582]

            c.set(sr.tl.x, random_range(sr.tl.y, sr.br.y - 1));

Replacement in crawl-ref/source/dungeon.cc at line 3689 [4.3429798]

B:BD[8.75686] → [8.75686:75782]

            c.set( sr.br.x, random_range(sr.tl.y, sr.br.y - 1) );
            delta.set( 1, 0);

[8.75686]

[8.75782]

            c.set(sr.br.x, random_range(sr.tl.y, sr.br.y - 1));
            delta.set(1, 0);

Replacement in crawl-ref/source/dungeon.cc at line 6220 [4.3429798]

B:BD[9.10037] → [8.86470:86522]

        sr.tl.set(25,25);
        sr.br.set(55,45);

[9.10037]

[4.3658298]

        sr.tl.set(25, 25);
        sr.br.set(55, 45);

Replacement in crawl-ref/source/dungeon.cc at line 7182 [4.3429798]

B:BD[4.3674934] → [4.3674934:3675003]

        type_floor = (coinflip()? DNGN_STONE_WALL : DNGN_ROCK_WALL);

[4.3674934]

[4.3675003]

        type_floor = (coinflip() ? DNGN_STONE_WALL : DNGN_ROCK_WALL);

Replacement in crawl-ref/source/dungeon.cc at line 7187 [4.3429798]
B:BD[4.3675091] → [4.3675091:3675135]
```
    if (player_in_branch( BRANCH_GEHENNA ))
```
[4.3675091]
[4.3675135]
```
    if (player_in_branch(BRANCH_GEHENNA))
```
Replacement in crawl-ref/source/dungeon.cc at line 7189 [4.3429798]
B:BD[4.3675167] → [4.3675167:3675216]
```
    else if (player_in_branch( BRANCH_COCYTUS ))
```
[4.3675167]
[4.3675216]
```
    else if (player_in_branch(BRANCH_COCYTUS))
```

Replacement in crawl-ref/source/dungeon.cc at line 7196 [4.3429798]

B:BD[4.3675351] → [8.87231:87339]

        sr.tl.set(8 + random2(43), 8 + random2(35) );
        sr.br.set(5 + random2(15), 5 + random2(10) );

[4.3675351]

[8.87339]

        sr.tl.set(8 + random2(43), 8 + random2(35));
        sr.br.set(5 + random2(15), 5 + random2(10));