fiddlerwoaroof/crawl - Change BP3W6RIQBMRI3NGRARGGQFAPDATWJ7KYHFRFQUAZ3F25ZIG2WS2AC

Fixing off-by-one issues in the tiles build due to the off-by-one fix to crawl_view. (This was manifesting as weird artifacts or crashes.)

Created by Enne Walker on October 17, 2009

BP3W6RIQBMRI3NGRARGGQFAPDATWJ7KYHFRFQUAZ3F25ZIG2WS2AC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/view.cc at line 4125 [5.16817]

B:BD[3.7823] → [4.216:298]

#ifdef USE_TILE
                const coord_def sep = ep - coord_def(1,1);
#endif

Replacement in crawl-ref/source/view.cc at line 4191 [5.16817]

B:BD[6.4296] → [4.896:1022]

                        env.tile_bk_bg(gc) = env.tile_bg(sep);
                        env.tile_bk_fg(gc) = env.tile_fg(sep);

[6.4296]

[7.310]

                        env.tile_bk_bg(gc) = env.tile_bg(ep);
                        env.tile_bk_fg(gc) = env.tile_fg(ep);

Replacement in crawl-ref/source/view.cc at line 4195 [5.16817]

B:BD[8.673] → [4.1023:1080]

                    tileb[bufcount] = env.tile_fg(sep) =

[8.673]

[6.4476]

                    tileb[bufcount] = env.tile_fg(ep) =

Replacement in crawl-ref/source/view.cc at line 4197 [5.16817]

B:BD[6.4532] → [4.1081:1139]

                    tileb[bufcount+1] = env.tile_bg(sep);

[6.4532]

[6.4601]

                    tileb[bufcount+1] = env.tile_bg(ep);

Replacement in crawl-ref/source/view.cc at line 4223 [5.16817]

B:BD[6.4626] → [4.1140:1256]

                    tileb[bufcount]   = env.tile_fg(sep);
                    tileb[bufcount+1] = env.tile_bg(sep);

[6.4626]

[6.4760]

                    tileb[bufcount]   = env.tile_fg(ep);
                    tileb[bufcount+1] = env.tile_bg(ep);

Replacement in crawl-ref/source/view.cc at line 4250 [5.16817]

B:BD[4.1558] → [4.1558:1631]

                                    get_clean_map_idx(env.tile_fg(sep));

[4.1558]

[6.5253]

                                    get_clean_map_idx(env.tile_fg(ep));

Replacement in crawl-ref/source/view.cc at line 4254 [5.16817]

B:BD[6.5346] → [4.1632:1703]

                                env.tile_bk_fg(gc) = env.tile_fg(sep);

[6.5346]

[6.5535]

                                env.tile_bk_fg(gc) = env.tile_fg(ep);

Replacement in crawl-ref/source/view.cc at line 4256 [5.16817]

B:BD[6.5565] → [4.1704:1771]

                            env.tile_bk_bg(gc) = env.tile_bg(sep);

[6.5565]

[6.5683]

                            env.tile_bk_bg(gc) = env.tile_bg(ep);

Replacement in crawl-ref/source/tilepick.cc at line 4527 [6.96318]
B:BD[6.210324] → [6.210324:210368]
```
            const coord_def ep(cx+1, cy+1);
```
[6.210324]
[2.2297]
```
            const coord_def ep(cx, cy);
```

Replacement in crawl-ref/source/tilepick.cc at line 4546 [6.96318]

B:BD[6.212048] → [6.212048:212139]

            env.tile_bg[ep.x-1][ep.y-1] = bg;
            env.tile_fg[ep.x-1][ep.y-1] = 0;

[6.212048]

[6.212139]

            env.tile_bg[ep.x][ep.y] = bg;
            env.tile_fg[ep.x][ep.y] = 0;

Replacement in crawl-ref/source/tilepick.cc at line 4558 [6.96318]
∅:D[9.4284] → [10.954:985]
B:BD[10.954] → [10.954:985]
```
    env.tile_fg[x-1][y-1] = t;
```
[9.4284]
[6.212371]
```
    env.tile_fg[x][y] = t;
```
Replacement in crawl-ref/source/tilepick.cc at line 4561 [6.96318]
B:BD[6.212414] → [6.212414:212466]
```
        env.tile_bg[x-1][y-1] |= TILE_FLAG_CURSOR3;
```
[6.212414]
[6.212466]
```
        env.tile_bg[x][y] |= TILE_FLAG_CURSOR3;
```
Replacement in crawl-ref/source/tilepick.cc at line 4567 [6.96318]
B:BD[6.212870] → [6.212870:212918]
```
    env.tile_fg[x-1][y-1] |= TILE_FLAG_S_UNDER;
```
[6.212870]
[6.212918]
```
    env.tile_fg[x][y] |= TILE_FLAG_S_UNDER;
```
Replacement in crawl-ref/source/tilepick.cc at line 4570 [6.96318]
B:BD[6.212961] → [6.212961:213013]
```
        env.tile_bg[x-1][y-1] |= TILE_FLAG_CURSOR3;
```
[6.212961]
[6.213013]
```
        env.tile_bg[x][y] |= TILE_FLAG_CURSOR3;
```

Replacement in crawl-ref/source/tilepick.cc at line 4605 [6.96318]

B:BD[11.494] → [11.494:564]

                    env.tile_bg[ep.x-1][ep.y-1] |= TILE_FLAG_CURSOR3;

[11.494]

[11.564]

                    env.tile_bg[ep.x][ep.y] |= TILE_FLAG_CURSOR3;

Replacement in crawl-ref/source/tilepick.cc at line 4630 [6.96318]
B:BD[6.216356] → [6.216356:216397]
```
        env.tile_fg[ep.x-1][ep.y-1] = t;
```
[6.216356]
[12.1793]
```
        env.tile_fg[ep.x][ep.y] = t;
```
Replacement in crawl-ref/source/tilepick.cc at line 4688 [6.96318]
B:BD[6.216527] → [13.38793:38850]
```
    env.tile_fg[x-1][y-1] = _tileidx_cloud(type, decay);
```
[6.216527]
[6.216582]
```
    env.tile_fg[x][y] = _tileidx_cloud(type, decay);
```

Replacement in crawl-ref/source/tilepick.cc at line 4717 [6.96318]

B:BD[14.1026] → [14.1026:1103]

        env.tile_bg[tile_ray_vec[i].ep.x-1][tile_ray_vec[i].ep.y-1] |= flag;

[14.1026]

[14.1103]

        env.tile_bg[tile_ray_vec[i].ep.x][tile_ray_vec[i].ep.y] |= flag;

Replacement in crawl-ref/source/externs.h at line 1727 [5.3270163]

B:BD[6.5932880] → [15.13675:13831]

    FixedArray<unsigned int,ENV_SHOW_DIAMETER-2,ENV_SHOW_DIAMETER-2> tile_fg;
    FixedArray<unsigned int,ENV_SHOW_DIAMETER-2,ENV_SHOW_DIAMETER-2> tile_bg;

[6.5932880]

[16.95633]

    FixedArray<unsigned int, ENV_SHOW_DIAMETER, ENV_SHOW_DIAMETER> tile_fg;
    FixedArray<unsigned int, ENV_SHOW_DIAMETER, ENV_SHOW_DIAMETER> tile_bg;

Fixing off-by-one issues in the tiles build due to the off-by-one fix to crawl_view. (This was manifesting as weird artifacts or crashes.)

Dependencies

In channels

Change contents

Deletion in crawl-ref/source/view.cc at line 4125 [5.16817]

Replacement in crawl-ref/source/view.cc at line 4191 [5.16817]

Replacement in crawl-ref/source/view.cc at line 4195 [5.16817]

Replacement in crawl-ref/source/view.cc at line 4197 [5.16817]

Replacement in crawl-ref/source/view.cc at line 4223 [5.16817]

Replacement in crawl-ref/source/view.cc at line 4250 [5.16817]

Replacement in crawl-ref/source/view.cc at line 4254 [5.16817]

Replacement in crawl-ref/source/view.cc at line 4256 [5.16817]

Replacement in crawl-ref/source/tilepick.cc at line 4527 [6.96318]

Replacement in crawl-ref/source/tilepick.cc at line 4546 [6.96318]

Replacement in crawl-ref/source/tilepick.cc at line 4558 [6.96318]

Replacement in crawl-ref/source/tilepick.cc at line 4561 [6.96318]

Replacement in crawl-ref/source/tilepick.cc at line 4567 [6.96318]

Replacement in crawl-ref/source/tilepick.cc at line 4570 [6.96318]

Replacement in crawl-ref/source/tilepick.cc at line 4605 [6.96318]

Replacement in crawl-ref/source/tilepick.cc at line 4630 [6.96318]

Replacement in crawl-ref/source/tilepick.cc at line 4688 [6.96318]

Replacement in crawl-ref/source/tilepick.cc at line 4717 [6.96318]

Replacement in crawl-ref/source/externs.h at line 1727 [5.3270163]