summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573>2008-09-27 14:29:31 +0000
committerennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573>2008-09-27 14:29:31 +0000
commit074c9aa085ffb0538baf9eb247d14454ca040540 (patch)
treec91f141ac9c8ae253747c2fc084be289afdf4d3f
parent6b8b7b40d0bfe7085011e1c6358c23a8071079a0 (diff)
downloadcrawl-ref-074c9aa085ffb0538baf9eb247d14454ca040540.tar.gz
crawl-ref-074c9aa085ffb0538baf9eb247d14454ca040540.zip
Fixing bug where doors closed out of sight would get a chainmail tile.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7038 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r--crawl-ref/source/acr.cc4
-rw-r--r--crawl-ref/source/dungeon.cc2
-rw-r--r--crawl-ref/source/spells2.cc2
-rw-r--r--crawl-ref/source/tilepick.cc5
-rw-r--r--crawl-ref/source/tiles.h1
5 files changed, 4 insertions, 10 deletions
diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc
index e266c63048..da78a91c36 100644
--- a/crawl-ref/source/acr.cc
+++ b/crawl-ref/source/acr.cc
@@ -3587,7 +3587,7 @@ static void _open_door(coord_def move, bool check_confused)
{
set_envmap_obj(dc, DNGN_OPEN_DOOR);
#ifdef USE_TILE
- tile_place_tile_bk(dc.x, dc.y, TILE_DNGN_OPEN_DOOR);
+ env.tile_bk_bg[dc.x][dc.y] = TILE_DNGN_OPEN_DOOR;
#endif
if (!seen_secret && grd(dc) == DNGN_SECRET_DOOR)
{
@@ -3753,7 +3753,7 @@ static void _close_door(coord_def move)
{
set_envmap_obj(dc, DNGN_CLOSED_DOOR);
#ifdef USE_TILE
- tile_place_tile_bk(dc.x, dc.y, TILE_DNGN_CLOSED_DOOR);
+ env.tile_bk_bg[dc.x][dc.y] = TILE_DNGN_CLOSED_DOOR;
#endif
}
}
diff --git a/crawl-ref/source/dungeon.cc b/crawl-ref/source/dungeon.cc
index 97a41164f3..5c12ab79e5 100644
--- a/crawl-ref/source/dungeon.cc
+++ b/crawl-ref/source/dungeon.cc
@@ -5067,7 +5067,7 @@ static void _replace_area( const coord_def& p1, const coord_def& p2,
{
set_envmap_obj(*ri, feature);
#ifdef USE_TILE
- tile_place_tile_bk(ri->x, ri->y, feature);
+ env.tile_bk_bg[ri->x][ri->y] = feature;
#endif
}
}
diff --git a/crawl-ref/source/spells2.cc b/crawl-ref/source/spells2.cc
index 5202345a3f..258d8a69d8 100644
--- a/crawl-ref/source/spells2.cc
+++ b/crawl-ref/source/spells2.cc
@@ -101,7 +101,7 @@ int detect_items( int pow )
#ifdef USE_TILE
// Don't replace previously seen items with an unseen one.
if (!is_terrain_seen(*ri))
- tile_place_tile_bk(ri->x, ri->y, TILE_UNSEEN_ITEM);
+ tile_place_item_bk(ri->x, ri->y, TILE_UNSEEN_ITEM);
#endif
}
}
diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc
index 406fabd6d8..5a24de239b 100644
--- a/crawl-ref/source/tilepick.cc
+++ b/crawl-ref/source/tilepick.cc
@@ -4049,11 +4049,6 @@ void tile_place_item_bk(int gx, int gy, int idx)
env.tile_bk_bg[gx][gy] |= TILE_FLAG_CURSOR3;
}
-void tile_place_tile_bk(int gx, int gy, int tileidx)
-{
- env.tile_bk_fg[gx][gy] = tileidx;
-}
-
// Called from item() in view.cc
void tile_place_item_marker(int x, int y, int idx)
{
diff --git a/crawl-ref/source/tiles.h b/crawl-ref/source/tiles.h
index 4652eca83a..8c297beb6a 100644
--- a/crawl-ref/source/tiles.h
+++ b/crawl-ref/source/tiles.h
@@ -79,7 +79,6 @@ void tile_place_monster(int gx, int gy, int idx, bool foreground = true,
bool detected = false);
void tile_place_item(int x, int y, int idx);
void tile_place_item_bk(int gx, int gy, int idx);
-void tile_place_tile_bk(int gx, int gy, int tileidx);
void tile_place_item_marker(int x, int y, int idx);
void tile_place_cloud(int x, int y, int type, int decay);
void tile_place_ray(const coord_def& gc);