fiddlerwoaroof/crawl - Change XIFNWKKXBHUZG52JL2PICXF4C3I5HDGFAEU2CHHVBXNT75WQE5NAC

Fixes for arena mode in tiles mode. It runs now, but there are still some visual issues (error tiles) because env.show gets updated weirdly in arena mode.

Tangentially related to fixing this, also cleaning up logic in view.cc to use grid2show, adding a number of asserts for tiles-related problems, adding error tiles for all textures, and fixing some incorrect logic about centering on the player instead of vgrdc.

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

Created by ennewalker on January 1, 2009

XIFNWKKXBHUZG52JL2PICXF4C3I5HDGFAEU2CHHVBXNT75WQE5NAC

Dependencies

In channels

main

Change contents

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

B:BD[6.484] → [5.56:134]

    const coord_def e = monster->pos() - crawl_view.glosc() + coord_def(9,9);

[6.484]

[6.578]

    const coord_def e = grid2show(monster->pos());

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

B:BD[6.2322] → [5.316:410]

    const coord_def e = env.cloud[cloudno].pos - crawl_view.glosc()
        + coord_def(9,9);

[6.2322]

[8.379]

    const coord_def e = grid2show(env.cloud[cloudno].pos);

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

B:BD[9.2565] → [9.2565:2669]

B:BD[9.2669] → [10.633:673]

            unsigned int cx = start_x + curs_x - 1;
            unsigned int cy = start_y + curs_y - 1;
            tiles.load_dungeon(cx, cy);

[9.2565]

[9.2745]

            coord_def cen(start_x + curs_x - 1, start_y + curs_y - 1);
            tiles.load_dungeon(cen);

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

B:BD[7.88678] → [11.6621:6701]

            const coord_def diff = monster->pos() - you.pos() + coord_def(9,9);

[7.88678]

[11.6701]

            const coord_def diff = grid2show(monster->pos());

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

∅:D[3.97] → [10.4431:4500]

B:BD[9.6538] → [10.4431:4500]

            tiles.load_dungeon(&tileb[0], you.pos().x, you.pos().y);

[3.97]

[10.4500]

            tiles.load_dungeon(&tileb[0], crawl_view.vgrdc);

Insertion in crawl-ref/source/tiletex.h at line 75 [10.6812]
[12.836]
[13.437]
```
    ASSERT(m_info_func);
```

Replacement in crawl-ref/source/tilesdl.h at line 91 [10.15441]

B:BD[10.17215] → [10.17215:17314]

    void load_dungeon(unsigned int *tileb, int gx, int gy);
    void load_dungeon(int gx, int gy);

[10.17215]

[10.17331]

    void load_dungeon(unsigned int *tileb, const coord_def &gc);
    void load_dungeon(const coord_def &gc);

Insertion in crawl-ref/source/tilesdl.cc at line 8 [10.19415]
[14.742]
[10.19538]
```
#include "state.h"
```

Replacement in crawl-ref/source/tilesdl.cc at line 319 [10.19415]

B:BD[10.24691] → [10.24691:24762]

void TilesFramework::load_dungeon(unsigned int *tileb, int gx, int gy)

[10.24691]

[10.24762]

void TilesFramework::load_dungeon(unsigned int *tileb, const coord_def &gc)

Replacement in crawl-ref/source/tilesdl.cc at line 325 [10.19415]

B:BD[10.24850] → [10.24850:24908]

    m_region_tile->load_dungeon(tileb, gx - ox, gy - oy);

[10.24850]

[10.24908]

    m_region_tile->load_dungeon(tileb, gc.x - ox, gc.y - oy);

Replacement in crawl-ref/source/tilesdl.cc at line 327 [10.19415]

B:BD[10.24909] → [10.24909:25001]

    coord_def win_start(gx - ox, gy - oy);
    coord_def win_end(gx + ox + 1, gy + oy + 1);

[10.24909]

[10.25001]

    coord_def win_start(gc.x - ox, gc.y - oy);
    coord_def win_end(gc.x + ox + 1, gc.y + oy + 1);

Replacement in crawl-ref/source/tilesdl.cc at line 333 [10.19415]
B:BD[10.25055] → [10.25055:25105]
```
void TilesFramework::load_dungeon(int cx, int cy)
```
[10.25055]
[10.25105]
```
void TilesFramework::load_dungeon(const coord_def &cen)
```

Replacement in crawl-ref/source/tilesdl.cc at line 348 [10.19415]

B:BD[10.25445] → [10.25445:25538]

            const coord_def gc(cx + x - wx/2,
                               cy + y - wy/2);

[10.25445]

[10.25538]

            const coord_def gc(cen.x + x - wx/2,
                               cen.y + y - wy/2);

Replacement in crawl-ref/source/tilesdl.cc at line 372 [10.19415]
B:BD[10.26220] → [10.26220:26262]
```
            if (gc.x == cx && gc.y == cy)
```
[10.26220]
[10.26262]
```
            if (gc.x == cen.x && gc.y == cen.y)
```
Replacement in crawl-ref/source/tilesdl.cc at line 380 [10.19415]
B:BD[10.26381] → [10.26381:26411]
```
    load_dungeon(tb, cx, cy);
```
[10.26381]
[10.26411]
```
    load_dungeon(tb, cen);
```
Replacement in crawl-ref/source/tilesdl.cc at line 1177 [10.19415]
B:BD[10.40376] → [10.40376:40410]
```
    if (!Options.tile_show_items)
```
[10.40376]
[10.40410]
```
    if (!Options.tile_show_items || crawl_state.arena)
```

Replacement in crawl-ref/source/tilereg.cc at line 1942 [10.54399]

B:BD[10.111563] → [10.111563:111621]

            tiles.load_dungeon(you.pos().x, you.pos().y);

[10.111563]

[10.111621]

            tiles.load_dungeon(crawl_view.vgrdc);

Replacement in crawl-ref/source/tilereg.cc at line 1956 [10.54399]
B:BD[10.111858] → [10.111858:111902]
```
            tiles.load_dungeon(gc.x, gc.y);
```
[10.111858]
[10.111902]
```
            tiles.load_dungeon(gc);
```
Replacement in crawl-ref/source/tilereg.cc at line 1969 [10.54399]
B:BD[10.112204] → [10.112204:112248]
```
            tiles.load_dungeon(gc.x, gc.y);
```
[10.112204]
[10.112248]
```
            tiles.load_dungeon(gc);
```

Replacement in crawl-ref/source/tilereg.cc at line 1975 [10.54399]

B:BD[10.112390] → [10.112390:112448]

            tiles.load_dungeon(you.pos().x, you.pos().y);

[10.112390]

[10.112448]

            m_far_view = false;
            tiles.load_dungeon(crawl_view.vgrdc);

Replacement in crawl-ref/source/tilepick.cc at line 986 [9.96318]
B:BD[15.22155] → [15.22155:22178]
```
    return TILE_ERROR;
```
[9.116144]
[9.117764]
```
    return TILEP_ERROR;
```
Replacement in crawl-ref/source/tilepick.cc at line 2242 [9.96318]
B:BD[16.1032] → [16.1032:1059]
```
        return TILE_ERROR;
```
[16.1032]
[16.1059]
```
        return TILE_DNGN_ERROR;
```
Replacement in crawl-ref/source/tilepick.cc at line 2250 [9.96318]
B:BD[2.346] → [2.346:373]
```
        return TILE_ERROR;
```
[2.346]
[16.1067]
```
        return TILE_DNGN_ERROR;
```
Replacement in crawl-ref/source/tilepick.cc at line 2276 [9.96318]
B:BD[17.1078] → [17.1078:1109]
```
            return TILE_ERROR;
```
[17.1078]
[17.1109]
```
            return TILE_DNGN_ERROR;
```
Replacement in crawl-ref/source/tilepick.cc at line 2466 [9.96318]
B:BD[18.4011] → [18.4011:4034]
```
    return TILE_ERROR;
```
[18.4011]
[9.153723]
```
    return TILE_DNGN_ERROR;
```

Replacement in crawl-ref/source/tilepick.cc at line 4244 [9.96318]

B:BD[9.210189] → [9.210189:210255]

B:BD[9.210261] → [9.210261:210314]

    int cx, cy;
    for (cy = 0; cy < env.tile_fg.height(); cy++)
        for (cx = 0; cx < env.tile_fg.width(); cx++)

[9.210189]

[9.210314]

    for (int cy = 0; cy < env.tile_fg.height(); cy++)
        for (int cx = 0; cx < env.tile_fg.width(); cx++)

Replacement in crawl-ref/source/tilepick.cc at line 4430 [9.96318]

B:BD[9.217499] → [19.1911:1978]

B:BD[19.1978] → [11.14971:15101]

            // View coords are not centered on you, but on (cx,cy)
            const int gx = view2gridX(x + 1) + cx - you.pos().x;
            const int gy = view2gridY(y + 1) + cy - you.pos().y;

[9.217499]

[9.217609]

            const int gx = view2gridX(x + crawl_view.viewp.x);
            const int gy = view2gridY(y + crawl_view.viewp.y);

Insertion in crawl-ref/source/rltiles/dc-player.txt at line 868 [9.4176224]
[13.47846]
```
dc-misc/error ERROR
```
Insertion in crawl-ref/source/rltiles/dc-dngn.txt at line 436 [9.4169495]
[10.158816]
```
dc-misc/error DNGN_ERROR
```

Replacement in crawl-ref/source/files.cc at line 1126 [7.3084589]

B:BD[4.2783] → [4.2783:2843]

        tiles.load_dungeon(NULL, you.pos().x, you.pos().y);

[4.2783]

[4.2843]

        tiles.load_dungeon(NULL, crawl_view.vgrdc);

Insertion in crawl-ref/source/arena.cc at line 209 [5.10815]

[5.14325]


#ifdef USE_TILE
        tile_init_default_flavour();
        tile_clear_flavour();
        TileNewLevel(true);
#endif

Insertion in crawl-ref/source/acr.cc at line 3886 [7.4397395]
[5.23347]
[5.23347]
```
#ifdef USE_TILE
        tiles.initialise_items();
#endif
```

Fixes for arena mode in tiles mode. It runs now, but there are still some visual issues (error tiles) because env.show gets updated weirdly in arena mode.

Dependencies

In channels

Change contents

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

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

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

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

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

Insertion in crawl-ref/source/tiletex.h at line 75 [10.6812]

Replacement in crawl-ref/source/tilesdl.h at line 91 [10.15441]

Insertion in crawl-ref/source/tilesdl.cc at line 8 [10.19415]

Replacement in crawl-ref/source/tilesdl.cc at line 319 [10.19415]

Replacement in crawl-ref/source/tilesdl.cc at line 325 [10.19415]

Replacement in crawl-ref/source/tilesdl.cc at line 327 [10.19415]

Replacement in crawl-ref/source/tilesdl.cc at line 333 [10.19415]

Replacement in crawl-ref/source/tilesdl.cc at line 348 [10.19415]

Replacement in crawl-ref/source/tilesdl.cc at line 372 [10.19415]

Replacement in crawl-ref/source/tilesdl.cc at line 380 [10.19415]

Replacement in crawl-ref/source/tilesdl.cc at line 1177 [10.19415]

Replacement in crawl-ref/source/tilereg.cc at line 1942 [10.54399]

Replacement in crawl-ref/source/tilereg.cc at line 1956 [10.54399]

Replacement in crawl-ref/source/tilereg.cc at line 1969 [10.54399]

Replacement in crawl-ref/source/tilereg.cc at line 1975 [10.54399]

Replacement in crawl-ref/source/tilepick.cc at line 986 [9.96318]

Replacement in crawl-ref/source/tilepick.cc at line 2242 [9.96318]

Replacement in crawl-ref/source/tilepick.cc at line 2250 [9.96318]

Replacement in crawl-ref/source/tilepick.cc at line 2276 [9.96318]

Replacement in crawl-ref/source/tilepick.cc at line 2466 [9.96318]

Replacement in crawl-ref/source/tilepick.cc at line 4244 [9.96318]

Replacement in crawl-ref/source/tilepick.cc at line 4430 [9.96318]

Insertion in crawl-ref/source/rltiles/dc-player.txt at line 868 [9.4176224]

Insertion in crawl-ref/source/rltiles/dc-dngn.txt at line 436 [9.4169495]

Replacement in crawl-ref/source/files.cc at line 1126 [7.3084589]

Insertion in crawl-ref/source/arena.cc at line 209 [5.10815]

Insertion in crawl-ref/source/acr.cc at line 3886 [7.4397395]