fiddlerwoaroof/crawl - Change WEZLXS4OSKPX6ZFFZZKKEO4NKG2QC4AFANVC34IYNDAEDGWJJHLQC

Minor changes.

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

Created by haranp on October 11, 2008

WEZLXS4OSKPX6ZFFZZKKEO4NKG2QC4AFANVC34IYNDAEDGWJJHLQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/view.cc at line 94 [6.16817]

B:BD[6.18611] → [6.18611:18661]

B:BD[6.18661] → [7.664:737]

// char colour_code_map(unsigned char map_value);
screen_buffer_t colour_code_map( int x, int y, bool item_colour = false,

[6.18611]

[8.778]

screen_buffer_t colour_code_map( const coord_def& p, bool item_colour = false,

Replacement in crawl-ref/source/view.cc at line 228 [6.16817]
B:BD[6.21197] → [9.1323:1356]
```
int get_envmap_col(int x, int y)
```
[6.21197]
[9.1356]
```
int get_envmap_col(const coord_def& p)
```
Replacement in crawl-ref/source/view.cc at line 230 [6.16817]
B:BD[9.1358] → [8.2349:2384]
```
    return (env.map[x][y].colour);
```
[9.1358]
[9.1405]
```
    return (env.map[p.x][p.y].colour);
```
Replacement in crawl-ref/source/view.cc at line 548 [6.16817]
B:BD[7.2407] → [10.1482:1529]
```
static char _get_travel_colour( int x, int y )
```
[7.2407]
[7.2453]
```
static char _get_travel_colour( const coord_def& p )
```
Replacement in crawl-ref/source/view.cc at line 550 [6.16817]
B:BD[7.2455] → [8.3745:3772]
```
    if (is_waypoint(x, y))
```
[7.2455]
[7.2490]
```
    if (is_waypoint(p))
```
Replacement in crawl-ref/source/view.cc at line 553 [6.16817]
B:BD[6.36893] → [8.3773:3819]
```
    short dist = travel_point_distance[x][y];
```
[6.36893]
[11.7536]
```
    short dist = travel_point_distance[p.x][p.y];
```

Replacement in crawl-ref/source/view.cc at line 639 [6.16817]

B:BD[11.8149] → [12.269:334]

screen_buffer_t colour_code_map( int x, int y, bool item_colour,

[11.8149]

[7.5387]

screen_buffer_t colour_code_map( const coord_def& p, bool item_colour,

Replacement in crawl-ref/source/view.cc at line 642 [6.16817]

B:BD[6.36932] → [8.3820:3878]

    const unsigned short map_flags = env.map[x][y].flags;

[6.36932]

[13.45]

    const unsigned short map_flags = env.map(p).flags;

Replacement in crawl-ref/source/view.cc at line 646 [6.16817]
∅:D[12.336] → [14.297:352]
B:BD[15.75] → [14.297:352]
```
    const dungeon_feature_type grid_value = grd[x][y];
```
[12.336]
[7.5565]
```
    const dungeon_feature_type grid_value = grd(p);
```

Replacement in crawl-ref/source/view.cc at line 648 [6.16817]

B:BD[7.5566] → [10.1840:1943]

    unsigned tc = travel_colour ? _get_travel_colour(x, y)
                                : DARKGREY;

[7.5566]

[12.371]

    unsigned tc = travel_colour ? _get_travel_colour(p) : DARKGREY;

Replacement in crawl-ref/source/view.cc at line 661 [6.16817]

B:BD[2.101] → [2.101:174]

    if (is_waypoint(x, y) || travel_point_distance[x][y] == PD_EXCLUDED)

[2.101]

[16.249]

    if (is_waypoint(p) || travel_point_distance[p.x][p.y] == PD_EXCLUDED)

Replacement in crawl-ref/source/view.cc at line 664 [6.16817]

B:BD[11.8688] → [8.3918:4000]

    if (item_colour && is_envmap_item(x, y))
        return get_envmap_col(x, y);

[11.8688]

[6.38048]

    if (item_colour && is_envmap_item(p))
        return get_envmap_col(p);

Replacement in crawl-ref/source/view.cc at line 668 [6.16817]

B:BD[11.8780] → [17.917:970]

    const bool terrain_seen = is_terrain_seen(x, y);

[11.8780]

[17.970]

    const bool terrain_seen = is_terrain_seen(p);

Replacement in crawl-ref/source/view.cc at line 676 [6.16817]

B:BD[17.1218] → [18.2285:2366]

            _view_emphasised_colour(coord_def(x, y), grid_value, feature_colour,

[17.1218]

[10.2014]

            _view_emphasised_colour(p, grid_value, feature_colour,

Replacement in crawl-ref/source/view.cc at line 686 [6.16817]

B:BD[4.1274] → [4.1274:1380]

        coord_def pos = coord_def(x,y);
        if (grd(pos) >= DNGN_MINMOVE && mgrd(pos) == NON_MONSTER)

[4.1274]

[4.1380]

        if (grd(p) >= DNGN_MINMOVE && mgrd(p) == NON_MONSTER)

Replacement in crawl-ref/source/view.cc at line 693 [6.16817]

B:BD[4.1644] → [4.1644:1711]

                const int newdist = grid_distance(pos, mon.pos());

[4.1644]

[4.1711]

                const int newdist = grid_distance(p, mon.pos());

Replacement in crawl-ref/source/view.cc at line 695 [6.16817]

B:BD[4.1712] → [4.1712:1790]

                if (olddist < newdist || !see_grid(env.show, pos, mon.pos()))

[4.1712]

[4.1790]

                if (olddist < newdist || !see_grid(env.show, p, mon.pos()))

Replacement in crawl-ref/source/view.cc at line 708 [6.16817]
∅:D[3.157] → [19.242:277]
B:BD[19.242] → [19.242:277]
```
        && igrd[x][y] != NON_ITEM)
```
[3.157]
[20.244]
```
        && igrd(p) != NON_ITEM)
```

Replacement in crawl-ref/source/view.cc at line 713 [6.16817]

B:BD[21.114] → [22.65:133]

             && grid_is_trap(grid_value) && igrd[x][y] != NON_ITEM)

[21.114]

[21.175]

             && grid_is_trap(grid_value) && igrd(p) != NON_ITEM)

Replacement in crawl-ref/source/view.cc at line 2770 [6.16817]
B:BD[7.14686] → [23.3049:3095]
```
        return is_waypoint(where.x, where.y);
```
[7.14686]
[7.14742]
```
        return is_waypoint(where);
```

Replacement in crawl-ref/source/view.cc at line 3131 [6.16817]

B:BD[8.4750] → [8.4750:4801]

                colour = colour_code_map(c.x, c.y,

[8.4750]

[24.469]

                colour = colour_code_map(c,

Replacement in crawl-ref/source/view.cc at line 3154 [6.16817]

B:BD[8.5789] → [8.5789:5851]

                    unsigned char ch = is_waypoint(c.x, c.y);

[8.5789]

[25.7]

                    unsigned char ch = is_waypoint(c);

Replacement in crawl-ref/source/view.cc at line 4994 [6.16817]

∅:D[24.1013] → [8.8828:8906]

B:BD[11.69560] → [8.8828:8906]

                            colour_code_map(gc.x, gc.y, Options.item_colour);

[24.1013]

[10.9589]

                            colour_code_map(gc, Options.item_colour);

Replacement in crawl-ref/source/view.cc at line 5140 [6.16817]

∅:D[24.1450] → [8.10542:10606]

B:BD[11.73786] → [8.10542:10606]

∅:D[8.10606] → [11.73854:73928]

B:BD[11.73854] → [11.73854:73928]

                                    colour_code_map(gc.x, gc.y,
                                                    Options.item_colour);

[24.1450]

[10.10029]

                                    colour_code_map(gc, Options.item_colour);

Replacement in crawl-ref/source/travel.h at line 66 [7.29464]
B:BD[7.30271] → [7.30271:30312]
```
unsigned char is_waypoint(int x, int y);
```
[7.30271]
[7.30312]
```
unsigned char is_waypoint(const coord_def &p);
```
Replacement in crawl-ref/source/travel.cc at line 398 [7.39949]
B:BD[7.46720] → [7.46720:46760]
```
unsigned char is_waypoint(int x, int y)
```
[7.46720]
[7.46760]
```
unsigned char is_waypoint(const coord_def &p)
```
Replacement in crawl-ref/source/travel.cc at line 402 [7.39949]
B:BD[7.46907] → [7.46907:46940]
```
    return curr_waypoints[x][y];
```
[7.46907]
[7.46940]
```
    return curr_waypoints[p.x][p.y];
```

Replacement in crawl-ref/source/travel.cc at line 1799 [7.39949]

B:BD[26.568] → [26.568:615]

                    || is_waypoint(dc.x, dc.y)

[26.568]

[26.615]

                    || is_waypoint(dc)

Replacement in crawl-ref/source/directn.cc at line 717 [6.3697945]

B:BD[27.2878] → [5.2853:2890]

        const coord_def offset(9,9);

[27.2878]

[27.2923]

        const coord_def offset(ENV_SHOW_OFFSET, ENV_SHOW_OFFSET);

Replacement in crawl-ref/source/directn.cc at line 754 [6.3697945]

B:BD[27.3367] → [5.3604:3641]

∅:D[5.3641] → [27.3367:3408]

B:BD[27.3367] → [27.3367:3408]

        const coord_def offset(9,9);
        for ( c.x = 0; c.x < 19; ++c.x )

[27.3367]

[27.3408]

        const coord_def offset(ENV_SHOW_OFFSET, ENV_SHOW_OFFSET);
        for ( c.x = 0; c.x < ENV_SHOW_DIAMETER; ++c.x )

Replacement in crawl-ref/source/directn.cc at line 757 [6.3697945]

B:BD[27.3418] → [27.3418:3463]

            for ( c.y = 0; c.y < 19; ++c.y )

[27.3418]

[27.3463]

            for ( c.y = 0; c.y < ENV_SHOW_DIAMETER; ++c.y )

Replacement in crawl-ref/source/directn.cc at line 775 [6.3697945]
∅:D[5.3943] → [27.3724:3764]
B:BD[27.3724] → [27.3724:3764]
```
    FixedArray<int,19,19> orig_colours;
```
[5.3943]
[5.3944]
```
    FixedArray<int, ENV_SHOW_DIAMETER, ENV_SHOW_DIAMETER> orig_colours;
```

Minor changes.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/view.cc at line 94 [6.16817]

Replacement in crawl-ref/source/view.cc at line 228 [6.16817]

Replacement in crawl-ref/source/view.cc at line 230 [6.16817]

Replacement in crawl-ref/source/view.cc at line 548 [6.16817]

Replacement in crawl-ref/source/view.cc at line 550 [6.16817]

Replacement in crawl-ref/source/view.cc at line 553 [6.16817]