fiddlerwoaroof/crawl - Change 33NP4VXH6MMMH4JFK73G4ENZ2VYFKW2AWXIRITZLVIENKDOSJO2AC

General code cleanups.

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

Created by haranp on June 15, 2008

33NP4VXH6MMMH4JFK73G4ENZ2VYFKW2AWXIRITZLVIENKDOSJO2AC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/view.cc at line 5707 [7.16817]

B:BD[6.9923] → [5.378:447]

                // The ray brings is out of bounds of the level map.

[6.9923]

[5.447]

                // The ray brings us out of bounds of the level map.

Replacement in crawl-ref/source/misc.h at line 124 [7.1928926]

B:BD[8.202] → [8.202:253]

coord_def pick_adjacent_free_square(int x, int y);

[8.202]

[9.9580]

coord_def pick_adjacent_free_square(const coord_def& p);

Replacement in crawl-ref/source/misc.cc at line 2399 [7.1933596]

B:BD[10.423] → [11.4748:4855]

        if (in_bounds(you.x_pos, you.y_pos)
            && env.cgrid[you.x_pos][you.y_pos] != EMPTY_CLOUD)

[10.423]

[10.469]

        // check clouds
        if (in_bounds(you.pos()) && env.cgrid(you.pos()) != EMPTY_CLOUD)

Replacement in crawl-ref/source/misc.cc at line 2402 [7.1933596]

B:BD[10.479] → [11.4856:4963]

            const cloud_type type =
                    env.cloud[ env.cgrid[you.x_pos][you.y_pos] ].type;

[10.479]

[3.8607]

            const cloud_type type = env.cloud[env.cgrid(you.pos())].type;

Replacement in crawl-ref/source/misc.cc at line 2559 [7.1933596]
B:BD[12.1552] → [12.1552:1588]
```
    const int grid = grd[c.x][c.y];
```
[12.1552]
[12.1588]
```
    const dungeon_feature_type grid = grd(c);
```

Replacement in crawl-ref/source/misc.cc at line 2606 [7.1933596]

B:BD[8.256] → [8.256:306]

coord_def pick_adjacent_free_square(int x, int y)

[8.256]

[8.306]

coord_def pick_adjacent_free_square(const coord_def& p)

Replacement in crawl-ref/source/misc.cc at line 2610 [7.1933596]
B:BD[8.358] → [8.358:400]
```
    for ( int ux = x-1; ux <= x+1; ++ux )
```
[8.358]
[8.400]
```
    for ( int ux = p.x-1; ux <= p.x+1; ++ux )
```

Replacement in crawl-ref/source/misc.cc at line 2612 [7.1933596]

B:BD[8.406] → [8.406:452]

        for ( int uy = y-1; uy <= y+1; ++uy )

[8.406]

[8.452]

        for ( int uy = p.y-1; uy <= p.y+1; ++uy )

Replacement in crawl-ref/source/misc.cc at line 2614 [7.1933596]
B:BD[8.462] → [8.462:500]
```
            if ( ux == x && uy == y )
```
[8.462]
[8.500]
```
            if ( ux == p.x && uy == p.y )
```

Replacement in crawl-ref/source/misc.cc at line 2617 [7.1933596]

B:BD[8.527] → [8.527:666]

            if ( ux >= 0 && ux < GXM && uy >= 0 && uy < GYM &&
                 grd[ux][uy] == DNGN_FLOOR && mgrd[ux][uy] == NON_MONSTER )

[8.527]

[8.666]

            if ( in_bounds(ux, uy)
                 && grd[ux][uy] == DNGN_FLOOR
                 && mgrd[ux][uy] == NON_MONSTER )

Replacement in crawl-ref/source/misc.cc at line 2672 [7.1933596]

B:BD[13.2971] → [13.2971:3110]

        if (you.has_usable_claws())
        {
            result = "claw";
            break;
        }
        // deliberate fall through

[13.2971]

[13.3110]

        result = (you.has_usable_claws() ? "claw" : "hand");

Deletion in crawl-ref/source/items.cc at line 369 [7.2584728]
B:BD[7.2593021] → [7.2593021:2593053]
```
    int c = 0;
    int cy = 0;
```
Replacement in crawl-ref/source/items.cc at line 380 [7.2584728]
B:BD[7.2593493] → [7.2593493:2593536]
```
        for (c = 0; c < MAX_MONSTERS; c++)
```
[7.2593493]
[7.2593536]
```
        for (int c = 0; c < MAX_MONSTERS; c++)
```
Replacement in crawl-ref/source/items.cc at line 382 [7.2584728]
B:BD[7.2593546] → [7.2593546:2593595]
```
            struct monsters *monster = &menv[c];
```
[7.2593546]
[7.2593595]
```
            monsters *monster = &menv[c];
```

Replacement in crawl-ref/source/items.cc at line 387 [7.2584728]

B:BD[7.2593660] → [7.2593660:2593715]

            for (cy = 0; cy < NUM_MONSTER_SLOTS; cy++)

[7.2593660]

[7.2593715]

            for (int cy = 0; cy < NUM_MONSTER_SLOTS; cy++)

Replacement in crawl-ref/source/items.cc at line 428 [7.2584728]

∅:D[2.9599] → [14.2941:3011]

B:BD[7.2594905] → [14.2941:3011]

        for (c = igrd[ mitm[dest].x ][ mitm[dest].y ]; c != NON_ITEM;

[2.9599]

[14.3011]

        for (int c = igrd[ mitm[dest].x ][ mitm[dest].y ]; c != NON_ITEM;

Replacement in crawl-ref/source/items.cc at line 466 [7.2584728]
B:BD[7.2596133] → [7.2596133:2596169]
```
    for (c = 0; c < MAX_ITEMS; c++)
```
[7.2596133]
[7.2596169]
```
    for (int c = 0; c < MAX_ITEMS; c++)
```

Replacement in crawl-ref/source/items.cc at line 482 [7.2584728]

B:BD[7.2596514] → [7.2596514:2596550]

B:BD[7.2596556] → [7.2596556:2596599]

    for (c = 2; c < (GXM - 1); c++)
        for (cy = 2; cy < (GYM - 1); cy++)

[7.2596514]

[7.2596599]

    for (int c = 2; c < (GXM - 1); c++)
        for (int cy = 2; cy < (GYM - 1); cy++)

Replacement in crawl-ref/source/items.cc at line 604 [7.2584728]

B:BD[15.5486] → [15.5486:5569]

B:BD[15.5569] → [16.45983:46018]


            mitm[o].base_type = OBJ_UNASSIGNED;
            mitm[o].quantity = 0;
            mitm[o].props.clear();

[15.5486]

[15.5569]

            mitm[o].clear();

Replacement in crawl-ref/source/items.cc at line 624 [7.2584728]
∅:D[15.5875] → [7.2598120:2598169]
∅:D[17.12964] → [7.2598120:2598169]
B:BD[7.2598120] → [7.2598120:2598169]
B:BD[7.2598169] → [4.7797:7832]
∅:D[4.7832] → [16.46019:46054]
B:BD[7.2598203] → [16.46019:46054]
```
            mitm[o].base_type = OBJ_UNASSIGNED;
            mitm[o].quantity  = 0;
            mitm[o].props.clear();
```
[15.5875]
[7.2598203]
```
            mitm[o].clear();
```

Replacement in crawl-ref/source/decks.cc at line 2341 [7.3987460]

∅:D[18.1325] → [8.1815:1892]

B:BD[8.1815] → [8.1815:1892]

            coord_def pos = pick_adjacent_free_square(you.x_pos, you.y_pos);

[18.1325]

[8.1892]

            const coord_def pos = pick_adjacent_free_square(you.pos());

General code cleanups.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/view.cc at line 5707 [7.16817]

Replacement in crawl-ref/source/misc.h at line 124 [7.1928926]

Replacement in crawl-ref/source/misc.cc at line 2399 [7.1933596]

Replacement in crawl-ref/source/misc.cc at line 2402 [7.1933596]

Replacement in crawl-ref/source/misc.cc at line 2559 [7.1933596]

Replacement in crawl-ref/source/misc.cc at line 2606 [7.1933596]

Replacement in crawl-ref/source/misc.cc at line 2610 [7.1933596]

Replacement in crawl-ref/source/misc.cc at line 2612 [7.1933596]

Replacement in crawl-ref/source/misc.cc at line 2614 [7.1933596]

Replacement in crawl-ref/source/misc.cc at line 2617 [7.1933596]

Replacement in crawl-ref/source/misc.cc at line 2672 [7.1933596]

Deletion in crawl-ref/source/items.cc at line 369 [7.2584728]

Replacement in crawl-ref/source/items.cc at line 380 [7.2584728]

Replacement in crawl-ref/source/items.cc at line 382 [7.2584728]

Replacement in crawl-ref/source/items.cc at line 387 [7.2584728]

Replacement in crawl-ref/source/items.cc at line 428 [7.2584728]

Replacement in crawl-ref/source/items.cc at line 466 [7.2584728]

Replacement in crawl-ref/source/items.cc at line 482 [7.2584728]

Replacement in crawl-ref/source/items.cc at line 604 [7.2584728]

Replacement in crawl-ref/source/items.cc at line 624 [7.2584728]

Replacement in crawl-ref/source/decks.cc at line 2341 [7.3987460]