From 715a7c2424c17e701f6e2a612e6cae6361556adf Mon Sep 17 00:00:00 2001
From: ennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573>
Date: Fri, 29 Feb 2008 05:43:42 +0000
Subject: 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
---
 crawl-ref/source/tile1.cc | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

(limited to 'crawl-ref/source/tile1.cc')

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)
-- 
cgit v1.2.3-54-g00ecf