diff options
| author | ennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-02-29 05:43:42 +0000 |
|---|---|---|
| committer | ennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-02-29 05:43:42 +0000 |
| commit | 715a7c2424c17e701f6e2a612e6cae6361556adf (patch) | |
| tree | 66d0f50fe59bb93549aa0872bbd01bd992feef68 /crawl-ref/source/tile1.cc | |
| parent | 172527be65069465e9d7b75938178a9cdee60c7d (diff) | |
| download | crawl-ref-715a7c2424c17e701f6e2a612e6cae6361556adf.tar.gz crawl-ref-715a7c2424c17e701f6e2a612e6cae6361556adf.zip | |
Adding different art for staves and rods so that they no longer look identical.
Rearranging staff and rod art assets.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3478 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/tile1.cc')
| -rw-r--r-- | crawl-ref/source/tile1.cc | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/crawl-ref/source/tile1.cc b/crawl-ref/source/tile1.cc index b59feeb8b6..be87bbf29b 100644 --- a/crawl-ref/source/tile1.cc +++ b/crawl-ref/source/tile1.cc @@ -1610,14 +1610,24 @@ int tileidx_item(const item_def &item) return TILE_BOOK_PAPYRUS; case OBJ_STAVES: - if (id[ IDTYPE_STAVES ][type] == ID_KNOWN_TYPE - || (item.flags & ISFLAG_KNOW_TYPE )) + if (item_is_rod(item)) { - return TILE_STAFF_WIZARDRY + type; + if (id[IDTYPE_STAVES][type] == ID_KNOWN_TYPE + || (item.flags & ISFLAG_KNOW_TYPE )) + { + return TILE_ROD_SMITING + type - STAFF_SMITING; + } + return TILE_ROD_OFFSET + (special / 4) % 10; + } + else + { + if (id[IDTYPE_STAVES][type] == ID_KNOWN_TYPE + || (item.flags & ISFLAG_KNOW_TYPE )) + { + return TILE_STAFF_WIZARDRY + type; + } + return TILE_STAFF_OFFSET + (special / 4) % 10; } - // Try to return an appropriate tile - // Note: We really need separate rod and stave tiles... - return TILE_STAFF_OFFSET + (special / 4) % 10; case OBJ_CORPSES: if (item.sub_type == CORPSE_SKELETON) |