diff options
| -rw-r--r-- | crawl-ref/source/rltiles/dc-dngn.txt | 6 | ||||
| -rw-r--r-- | crawl-ref/source/rltiles/dc-dngn/gate_closed_left.bmp | bin | 0 -> 2102 bytes | |||
| -rw-r--r-- | crawl-ref/source/rltiles/dc-dngn/gate_closed_middle.bmp | bin | 0 -> 2102 bytes | |||
| -rw-r--r-- | crawl-ref/source/rltiles/dc-dngn/gate_closed_right.bmp | bin | 0 -> 2102 bytes | |||
| -rw-r--r-- | crawl-ref/source/rltiles/dc-dngn/gate_open_left.bmp | bin | 0 -> 2102 bytes | |||
| -rw-r--r-- | crawl-ref/source/rltiles/dc-dngn/gate_open_middle.bmp | bin | 0 -> 2102 bytes | |||
| -rw-r--r-- | crawl-ref/source/rltiles/dc-dngn/gate_open_right.bmp | bin | 0 -> 2102 bytes | |||
| -rw-r--r-- | crawl-ref/source/tile1.cc | 37 |
8 files changed, 42 insertions, 1 deletions
diff --git a/crawl-ref/source/rltiles/dc-dngn.txt b/crawl-ref/source/rltiles/dc-dngn.txt index 56b60bdb8c..e42055a6bc 100644 --- a/crawl-ref/source/rltiles/dc-dngn.txt +++ b/crawl-ref/source/rltiles/dc-dngn.txt @@ -76,7 +76,13 @@ dngn_transparent_wall DNGN_TRANSPARENT_WALL #dngn_stone_wall DNGN_STONE_WALL dngn_closed_door DNGN_CLOSED_DOOR +gate_closed_left DNGN_GATE_CLOSED_LEFT +gate_closed_middle DNGN_GATE_CLOSED_MIDDLE +gate_closed_right DNGN_GATE_CLOSED_RIGHT dngn_open_door DNGN_OPEN_DOOR +gate_open_left DNGN_GATE_OPEN_LEFT +gate_open_middle DNGN_GATE_OPEN_MIDDLE +gate_open_right DNGN_GATE_OPEN_RIGHT ###dc/wal8 DNGN_SECRET_DOOR dngn_orcish_idol DNGN_ORCISH_IDOL dngn_silver_statue DNGN_SILVER_STATUE diff --git a/crawl-ref/source/rltiles/dc-dngn/gate_closed_left.bmp b/crawl-ref/source/rltiles/dc-dngn/gate_closed_left.bmp Binary files differnew file mode 100644 index 0000000000..6e462dbfe4 --- /dev/null +++ b/crawl-ref/source/rltiles/dc-dngn/gate_closed_left.bmp diff --git a/crawl-ref/source/rltiles/dc-dngn/gate_closed_middle.bmp b/crawl-ref/source/rltiles/dc-dngn/gate_closed_middle.bmp Binary files differnew file mode 100644 index 0000000000..f2683e6c49 --- /dev/null +++ b/crawl-ref/source/rltiles/dc-dngn/gate_closed_middle.bmp diff --git a/crawl-ref/source/rltiles/dc-dngn/gate_closed_right.bmp b/crawl-ref/source/rltiles/dc-dngn/gate_closed_right.bmp Binary files differnew file mode 100644 index 0000000000..39471d083c --- /dev/null +++ b/crawl-ref/source/rltiles/dc-dngn/gate_closed_right.bmp diff --git a/crawl-ref/source/rltiles/dc-dngn/gate_open_left.bmp b/crawl-ref/source/rltiles/dc-dngn/gate_open_left.bmp Binary files differnew file mode 100644 index 0000000000..aefd6e74cc --- /dev/null +++ b/crawl-ref/source/rltiles/dc-dngn/gate_open_left.bmp diff --git a/crawl-ref/source/rltiles/dc-dngn/gate_open_middle.bmp b/crawl-ref/source/rltiles/dc-dngn/gate_open_middle.bmp Binary files differnew file mode 100644 index 0000000000..ae56cf8f47 --- /dev/null +++ b/crawl-ref/source/rltiles/dc-dngn/gate_open_middle.bmp diff --git a/crawl-ref/source/rltiles/dc-dngn/gate_open_right.bmp b/crawl-ref/source/rltiles/dc-dngn/gate_open_right.bmp Binary files differnew file mode 100644 index 0000000000..6fb2ccbd85 --- /dev/null +++ b/crawl-ref/source/rltiles/dc-dngn/gate_open_right.bmp diff --git a/crawl-ref/source/tile1.cc b/crawl-ref/source/tile1.cc index 9f339ae0b2..3f3e3e5a61 100644 --- a/crawl-ref/source/tile1.cc +++ b/crawl-ref/source/tile1.cc @@ -2094,6 +2094,11 @@ void finalize_tile(unsigned int *tile, bool is_special, // These types always have four flavors... (*tile) = orig + (floor_flv % 4); } + else if (orig == TILE_DNGN_CLOSED_DOOR || orig == TILE_DNGN_OPEN_DOOR) + { + ASSERT(special_flv >= 0 && special_flv <= 3); + (*tile) = orig + special_flv; + } (*tile) |= flag; } @@ -3348,7 +3353,37 @@ void tile_init_flavor() env.tile_flavor[x][y].floor = floor_flavor; env.tile_flavor[x][y].wall = wall_flavor; - if (bazaar && env.grid_colours[x][y] == baz_col && + if (grd[x][y] == DNGN_CLOSED_DOOR || grd[x][y] == DNGN_OPEN_DOOR) + { + // Check for horizontal gates. + + 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]); + bool door_up = (y > 0 && grd[x][y-1] == grd[x][y]); + bool door_down = (y < GYM - 1 && grd[x][y+1] == grd[x][y]); + + if ((door_left || door_right) && !door_up && !door_down) + { + 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; + + // NOTE: this requires that closed gates and open gates + // are positioned in the tile set relative to their + // door counterpart. + env.tile_flavor[x][y].special = + target - TILE_DNGN_CLOSED_DOOR; + } + else + { + env.tile_flavor[x][y].special = 0; + } + } + else if (bazaar && env.grid_colours[x][y] == baz_col && grd[x][y] == DNGN_FLOOR) { int left_grd = (x > 0) ? grd[x-1][y] : DNGN_ROCK_WALL; |
