diff options
author | ennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-02-10 20:44:52 +0000 |
---|---|---|
committer | ennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-02-10 20:44:52 +0000 |
commit | cdb351ec5d687f44623cc402e371825f98599bf7 (patch) | |
tree | 1ea488851a04b9bbe17045faeb7d0de17e116e2a /crawl-ref/source/tile2.cc | |
parent | a028038652c432ed0ee67ca632edea8deb410ef0 (diff) | |
download | crawl-ref-cdb351ec5d687f44623cc402e371825f98599bf7.tar.gz crawl-ref-cdb351ec5d687f44623cc402e371825f98599bf7.zip |
Adding icons (from Denzi) for identified staves and rods, now that identical staff types share the same description.
Removing old Nethack item tiles.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3425 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/tile2.cc')
-rw-r--r-- | crawl-ref/source/tile2.cc | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/crawl-ref/source/tile2.cc b/crawl-ref/source/tile2.cc index 2228dccd1e..70005427a9 100644 --- a/crawl-ref/source/tile2.cc +++ b/crawl-ref/source/tile2.cc @@ -2251,7 +2251,7 @@ void TileGhostInit(const struct ghost_demon &ghost) void TileInitItems() { - for(int i=0; i<NUM_POTIONS; i++) + for (int i = 0; i < NUM_POTIONS; i++) { int special = you.item_description[IDESC_POTIONS][i]; int tile0 = TILE_POTION_OFFSET + special % 14; @@ -2259,10 +2259,10 @@ void TileInitItems() ImgCopyFromTileImg(tile0, DollCacheImg, 0, 0, 1); ImgCopyFromTileImg(tile1, DollCacheImg, 0, 0, 0); - ImgCopyToTileImg (tile1, DollCacheImg, 0, 0, 1); + ImgCopyToTileImg(tile1, DollCacheImg, 0, 0, 1); } - for(int i=0; i<NUM_WANDS; i++) + for (int i = 0; i < NUM_WANDS; i++) { int special = you.item_description[IDESC_WANDS][i]; int tile0 = TILE_WAND_OFFSET + special % 12; @@ -2270,7 +2270,18 @@ void TileInitItems() ImgCopyFromTileImg(tile0, DollCacheImg, 0, 0, 1); ImgCopyFromTileImg(tile1, DollCacheImg, 0, 0, 0); - ImgCopyToTileImg (tile1, DollCacheImg, 0, 0, 1); + ImgCopyToTileImg(tile1, DollCacheImg, 0, 0, 1); + } + + for (int i = 0; i < NUM_STAVES; i++) + { + int special = you.item_description[IDESC_STAVES][i]; + int tile0 = TILE_STAFF_OFFSET + (special / 4) % 10; + int tile1 = TILE_STAFF_WIZARDRY + i; + + ImgCopyFromTileImg(tile0, DollCacheImg, 0, 0, 1); + ImgCopyFromTileImg(tile1, DollCacheImg, 0, 0, 0); + ImgCopyToTileImg(tile1, DollCacheImg, 0, 0, 1); } } |