summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/tilepick.cc
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2009-07-19 12:46:50 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2009-07-19 12:46:50 +0000
commitc4f7e626b7e1267e6540ed9d6057f7fe34b61c58 (patch)
tree99e4039e9cdfd1accb1e85d4c56b7e15f92297b5 /crawl-ref/source/tilepick.cc
parentf792800793a058d6668908b80b63b16d48ae50ed (diff)
downloadcrawl-ref-c4f7e626b7e1267e6540ed9d6057f7fe34b61c58.tar.gz
crawl-ref-c4f7e626b7e1267e6540ed9d6057f7fe34b61c58.zip
Backport my previous commit (Zot remaining open once entered) to 0.5.
Also replace the (unused) branch entry tile with the new Zot entry tile. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.5@10304 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/tilepick.cc')
-rw-r--r--crawl-ref/source/tilepick.cc7
1 files changed, 6 insertions, 1 deletions
diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc
index 965cad5ebb..8c290ab2b4 100644
--- a/crawl-ref/source/tilepick.cc
+++ b/crawl-ref/source/tilepick.cc
@@ -2441,7 +2441,6 @@ int tileidx_feature(int object, int gx, int gy)
case DNGN_ENTER_VAULTS:
case DNGN_ENTER_CRYPT:
case DNGN_ENTER_HALL_OF_BLADES:
- case DNGN_ENTER_ZOT:
case DNGN_ENTER_TEMPLE:
case DNGN_ENTER_SNAKE_PIT:
case DNGN_ENTER_ELVEN_HALLS:
@@ -2449,6 +2448,10 @@ int tileidx_feature(int object, int gx, int gy)
case DNGN_ENTER_SWAMP:
case DNGN_ENTER_SHOALS:
return TILE_DNGN_ENTER;
+
+ case DNGN_ENTER_ZOT:
+ return TILE_DNGN_ENTER_ZOT;
+
case DNGN_RETURN_FROM_ORCISH_MINES:
case DNGN_RETURN_FROM_HIVE:
case DNGN_RETURN_FROM_LAIR:
@@ -2648,6 +2651,7 @@ void tileidx_unseen(unsigned int &fg, unsigned int &bg, int ch,
case '\\': fg = TILE_STAFF_OFFSET; break;
case '^': bg = TILE_DNGN_TRAP_ZOT; break;
case '_':
+ case 220:
case 131: fg = TILE_UNSEEN_ALTAR; break;
case '~': fg = TILE_UNSEEN_ITEM; break;
case '{':
@@ -2658,6 +2662,7 @@ void tileidx_unseen(unsigned int &fg, unsigned int &bg, int ch,
case 128: //old
case 254: bg = TILE_DNGN_CLOSED_DOOR; break;
case 129: bg = TILE_DNGN_RETURN; break;
+ case 239:
case 132: fg = TILE_UNSEEN_ENTRANCE; break;
case 136: bg = TILE_DNGN_ENTER; break;
case 141: bg = TILE_DNGN_LAVA; break;