Fix rod tiles (#5818).

Subtype and appearance are independent on rods; that makes the normal
hack inapplicable, since it displays the appearance tile for an item
depending on the subtype icon. This makes it very hard to display both
the appearance tile and the subtype icon for a rod on the floor (since
we can only pass one tile index to the rendering code -- that's why
there's the whole mcache thing for monsters).

This is the cowardly fix: Rods on the floor only get the appearance
tile, rods in the inventory menu and region use the same hack as
weapons, armour and ammo (where the brand icon isn't displayed on the
floor either).

I have another fix which displays the subtype icons on the floor, but
it is extremely ugly. The whole tile picking and rendering code could
really use a big refactoring; I don't want to add even more hackiness.

1 files changed, 4 insertions, 1 deletions

diff --git a/crawl-ref/source/tilereg-inv.cc b/crawl-ref/source/tilereg-inv.cc
index df9a6be92e..1d8f7f3bf7 100644
--- a/crawl-ref/source/tilereg-inv.cc
+++ b/crawl-ref/source/tilereg-inv.cc
@@ -617,8 +617,11 @@ static void _fill_item_info(InventoryTile &desc, const item_info &item)
     else
         desc.quantity = -1;
 
-    if (type == OBJ_WEAPONS || type == OBJ_MISSILES || type == OBJ_ARMOUR)
+    if (type == OBJ_WEAPONS || type == OBJ_MISSILES
+        || type == OBJ_ARMOUR || type == OBJ_RODS)
+    {
         desc.special = tileidx_known_brand(item);
+    }
     else if (type == OBJ_CORPSES)
         desc.special = tileidx_corpse_brand(item);