fiddlerwoaroof/crawl - Change YRZBGNKW7PP3UJEKNO22FMMC7W5V52L4LZAWE3C3UKTO2NNSXA4QC

Fixing &L vaults not having their tile flavor initialized properly. In particular, non-gate doors would appear as half a gate.

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

Created by ennewalker on January 17, 2009

YRZBGNKW7PP3UJEKNO22FMMC7W5V52L4LZAWE3C3UKTO2NNSXA4QC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/tiles.h at line 103 [5.7013]
[4.361]
[3.1412]
```
void tile_init_flavour(const coord_def &gc);
```

Replacement in crawl-ref/source/tilepick.cc at line 3984 [5.96318]

B:BD[5.199398] → [3.2391:2463]

∅:D[3.2463] → [5.199476:199486]

B:BD[5.199476] → [5.199476:199486]

B:BD[5.199486] → [3.2464:2746]

    for (int y = 0; y < GYM; y++)
        for (int x = 0; x < GXM; x++)
        {
            int max_wall_flavor = tile_dngn_count(env.tile_default.wall) - 1;
            int max_floor_flavor = tile_dngn_count(env.tile_default.floor) - 1;
            int wall_rnd = random_range(0, max_wall_flavor);
            int floor_rnd = random_range(0, max_floor_flavor);

[5.199398]

[5.199742]

    for (rectangle_iterator ri(1); ri; ++ri)
        tile_init_flavour(*ri);
}
void tile_init_flavour(const coord_def &gc)
{
    if (!in_bounds(gc))
        return;
    int wall_rnd = random2(tile_dngn_count(env.tile_default.wall));
    int floor_rnd = random2(tile_dngn_count(env.tile_default.floor));
    if (!env.tile_flv(gc).floor)
        env.tile_flv(gc).floor = env.tile_default.floor + floor_rnd;
    if (!env.tile_flv(gc).wall)
        env.tile_flv(gc).wall = env.tile_default.wall + wall_rnd;

Replacement in crawl-ref/source/tilepick.cc at line 4001 [5.96318]

B:BD[5.199743] → [3.2747:2987]

            if (!env.tile_flv[x][y].floor)
                env.tile_flv[x][y].floor = env.tile_default.floor + floor_rnd;
            if (!env.tile_flv[x][y].wall)
                env.tile_flv[x][y].wall = env.tile_default.wall + wall_rnd;

[5.199743]

[5.199853]

    if (grd(gc) == DNGN_CLOSED_DOOR || grd(gc) == DNGN_OPEN_DOOR)
    {
        // Check for horizontal gates.

Replacement in crawl-ref/source/tilepick.cc at line 4005 [5.96318]

B:BD[5.199854] → [6.322:461]

            if (grd[x][y] == DNGN_CLOSED_DOOR || grd[x][y] == DNGN_OPEN_DOOR)
            {
                // Check for horizontal gates.

[5.199854]

[6.461]

        const coord_def left(gc.x - 1, gc.y);
        const coord_def right(gc.x + 1, gc.y);

Replacement in crawl-ref/source/tilepick.cc at line 4008 [5.96318]

B:BD[6.462] → [7.1236:1307]

∅:D[7.1307] → [6.532:609]

B:BD[6.532] → [6.532:609]

                bool door_left  = (x > 0 && grd[x-1][y] == grd[x][y]);
                bool door_right = (x < GXM - 1 && grd[x+1][y] == grd[x][y]);

[6.462]

[6.753]

        bool door_left  = (grd(left) == grd(gc));
        bool door_right = (grd(right) == grd(gc));

Replacement in crawl-ref/source/tilepick.cc at line 4011 [5.96318]

B:BD[6.754] → [8.142:187]

∅:D[8.187] → [6.827:1177]

B:BD[6.827] → [6.827:1177]

                if (door_left || door_right)
                {
                    int target;
                    if (door_left && door_right)
                        target = TILE_DNGN_GATE_CLOSED_MIDDLE;
                    else if (door_left)
                        target = TILE_DNGN_GATE_CLOSED_RIGHT;
                    else
                        target = TILE_DNGN_GATE_CLOSED_LEFT;

[6.754]

[6.1177]

        if (door_left || door_right)
        {
            int target;
            if (door_left && door_right)
                target = TILE_DNGN_GATE_CLOSED_MIDDLE;
            else if (door_left)
                target = TILE_DNGN_GATE_CLOSED_RIGHT;
            else
                target = TILE_DNGN_GATE_CLOSED_LEFT;

Replacement in crawl-ref/source/tilepick.cc at line 4021 [5.96318]

B:BD[6.1178] → [7.1308:1384]

∅:D[7.1384] → [6.1254:1367]

B:BD[6.1254] → [6.1254:1367]

B:BD[6.1367] → [9.126114:126163]

∅:D[9.126163] → [6.1419:1532]

B:BD[6.1419] → [6.1419:1532]

B:BD[6.1532] → [9.126164:126216]

∅:D[9.126216] → [6.1587:1605]

B:BD[6.1587] → [6.1587:1605]

B:BD[6.1605] → [2.240:368]

∅:D[2.368] → [6.1605:1619]

B:BD[6.1605] → [6.1605:1619]

B:BD[6.1619] → [3.2988:3038]

∅:D[10.647] → [5.199903:199917]

∅:D[3.3038] → [5.199903:199917]

∅:D[11.37999] → [5.199903:199917]

B:BD[5.199903] → [5.199903:199917]

B:BD[5.199917] → [3.3039:3112]

                    // NOTE: This requires that closed gates and open gates
                    // are positioned in the tile set relative to their
                    // door counterpart.
                    env.tile_flv[x][y].special =
                        target - TILE_DNGN_CLOSED_DOOR;
                }
                else
                {
                    env.tile_flv[x][y].special = 0;
                }
            }
            else if (grd[x][y] == DNGN_SECRET_DOOR)
            {
                env.tile_flv[x][y].special = 0;
            }
            else if (!env.tile_flv[x][y].special)
            {
                env.tile_flv[x][y].special = random2(256);
            }

[6.1178]

[3.3112]

            // NOTE: This requires that closed gates and open gates
            // are positioned in the tile set relative to their
            // door counterpart.
            env.tile_flv(gc).special = target - TILE_DNGN_CLOSED_DOOR;
        }
        else
        {
            env.tile_flv(gc).special = 0;

Insertion in crawl-ref/source/tilepick.cc at line 4030 [5.96318]

[3.3122]

    }
    else if (grd(gc) == DNGN_SECRET_DOOR)
    {
        env.tile_flv(gc).special = 0;
    }
    else if (!env.tile_flv(gc).special)
    {
        env.tile_flv(gc).special = random2(256);
    }

Insertion in crawl-ref/source/dungeon.cc at line 8310 [13.3429798]
[12.4952]
[12.4952]
```
#ifdef USE_TILE
            tile_init_flavour(*ri);
#endif
```