fiddlerwoaroof/crawl - Change YHC3WZ5ATCJCQQ4CMWJA2IDPSY6FQZP7HJL6JI5WXETTY54BJU2AC

[2021068] Projectiles, explosions, beams, etc. now drawn again in tiles version.

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

Created by ennewalker on September 27, 2008

YHC3WZ5ATCJCQQ4CMWJA2IDPSY6FQZP7HJL6JI5WXETTY54BJU2AC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/view.cc at line 4849 [4.16817]
[3.3576]
[3.3576]
```
    tiles.clear_overlays();
```

Insertion in crawl-ref/source/tilesdl.h at line 121 [5.15441]

[5.18094]


    void add_overlay(const coord_def &gc, int idx);
    void clear_overlays();

Insertion in crawl-ref/source/tilesdl.cc at line 1201 [5.19415]

[5.44800]

}
void TilesFramework::add_overlay(const coord_def &gc, int idx)
{
    m_region_tile->add_overlay(gc, idx);

Insertion in crawl-ref/source/tilesdl.cc at line 1207 [5.19415]

[5.44802]


void TilesFramework::clear_overlays()
{
    m_region_tile->clear_overlays();
}

Deletion in crawl-ref/source/tiles.h at line 117 [3.7013]
B:BD[3.9555] → [3.9555:9596]
```
void TileDrawBolt(int x, int y, int fg);
```

Insertion in crawl-ref/source/tilereg.h at line 250 [5.45514]

[5.50984]

    void add_overlay(const coord_def &gc, int idx);
    void clear_overlays();

Insertion in crawl-ref/source/tilereg.h at line 269 [5.45514]

[5.51922]

[5.51946]


    struct tile_overlay
    {
        coord_def gc;
        int idx;
    };
    std::vector<tile_overlay> m_overlays;

Insertion in crawl-ref/source/tilereg.cc at line 719 [5.54399]

[2.1394]


    if (m_verts.size() > 0)
    {
        m_image->m_textures[TEX_DEFAULT].bind();
        glVertexPointer(2, GL_FLOAT, sizeof(tile_vert), &m_verts[0].pos_x);
        glTexCoordPointer(2, GL_FLOAT, sizeof(tile_vert), &m_verts[0].tex_x);
        glDrawArrays(GL_QUADS, 0, m_verts.size());
    }
    m_verts.clear();
    for (unsigned int i = 0; i < m_overlays.size(); i++)
    {
        // overlays must be from the main image and must be in LOS.
        if (!crawl_view.in_grid_los(m_overlays[i].gc))
            continue;
        int idx = m_overlays[i].idx;
        if (idx >= TILE_MAIN_MAX)
            continue;

Insertion in crawl-ref/source/tilereg.cc at line 739 [5.54399]

[2.1395]

[5.79272]

        int x = m_overlays[i].gc.x - m_cx_to_gx;
        int y = m_overlays[i].gc.y - m_cy_to_gy;
        add_quad(TEX_DEFAULT, idx, x, y);
    }

Insertion in crawl-ref/source/tilereg.cc at line 1043 [5.54399]

[5.88032]

}
void DungeonRegion::add_overlay(const coord_def &gc, int idx)
{
    tile_overlay over;
    over.gc = gc;
    over.idx = idx;
    m_overlays.push_back(over);

Insertion in crawl-ref/source/tilereg.cc at line 1054 [5.54399]
[5.88035]
[5.88035]
```
void DungeonRegion::clear_overlays()
{
    m_overlays.clear();
}
```
Deletion in crawl-ref/source/tile2.cc at line 68 [3.13289]
B:BD[3.36590] → [6.500:542]
B:BD[6.542] → [5.145848:145871]
∅:D[5.145871] → [6.543:588]
B:BD[3.36632] → [6.543:588]
∅:D[6.588] → [7.2875:2906]
B:BD[3.36675] → [7.2875:2906]
B:BD[7.2906] → [5.145872:145879]
∅:D[5.145879] → [3.37982:37984]
B:BD[3.37982] → [3.37982:37984]
B:BD[3.39035] → [3.39035:39036]
```
void TileDrawBolt(int x, int y, int fg)
{
    // TODO enne
#if 0
    t1buf[x+1][y+1] = fg | TILE_FLAG_FLYING;
    _update_single_grid(x, y);
#endif
}
```

Replacement in crawl-ref/source/beam.cc at line 178 [4.4128068]

B:BD[3.5936845] → [5.225432:225462]

B:BD[5.225462] → [8.55790:55855]

        // TODO enne - fixme!
        TileDrawBolt(drawp.x-1, drawp.y-1, tileidx_zap(colour));

[3.5936845]

[3.5936906]

        tiles.add_overlay(p, tileidx_zap(colour));

Replacement in crawl-ref/source/beam.cc at line 1755 [4.4128068]

B:BD[9.33548] → [8.57311:57412]

            if (tile_beam != -1 && in_los_bounds(drawpos)
                && (testpos != you.pos()))

[9.33548]

[3.5937395]

            if (tile_beam != -1 && in_los_bounds(drawpos))

Replacement in crawl-ref/source/beam.cc at line 1757 [4.4128068]

B:BD[3.5937409] → [8.57413:57480]

                TileDrawBolt(drawpos.x-1, drawpos.y-1, tile_beam);

[3.5937409]

[3.5937468]

                tiles.add_overlay(testpos, tile_beam);

Replacement in crawl-ref/source/beam.cc at line 5371 [4.4128068]

B:BD[8.63955] → [8.63955:64031]

                TileDrawBolt(drawpos.x-1, drawpos.y-1, tileidx_bolt(beam));

[8.63955]

[3.5937663]

                tiles.add_overlay(realpos, tileidx_bolt(beam));