[1974966] Display icon for hostile weapons in tiles.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5768 c06c8d41-db1a-0410-9941-cceddc491573

5 files changed, 8 insertions, 1 deletions

diff --git a/crawl-ref/source/rltiles/dc-misc.txt b/crawl-ref/source/rltiles/dc-misc.txt
index acb230214a..b331142539 100644
--- a/crawl-ref/source/rltiles/dc-misc.txt
+++ b/crawl-ref/source/rltiles/dc-misc.txt
@@ -57,6 +57,7 @@ cursor_green CURSOR3
 %rim 1

 heart HEART

 neutral NEUTRAL

+animated_weapon ANIMATED_WEAPON

 poison POISON

 %rim 0

 may_stab_brand MAY_STAB_BRAND

diff --git a/crawl-ref/source/rltiles/dc-misc/animated_weapon.bmp b/crawl-ref/source/rltiles/dc-misc/animated_weapon.bmp
new file mode 100644
index 0000000000..cc39350f6f
--- /dev/null
+++ b/crawl-ref/source/rltiles/dc-misc/animated_weapon.bmp
diff --git a/crawl-ref/source/tile1.cc b/crawl-ref/source/tile1.cc
index 3a8a18a3b5..2bbdda8506 100644
--- a/crawl-ref/source/tile1.cc
+++ b/crawl-ref/source/tile1.cc
@@ -391,7 +391,7 @@ static int _tileidx_monster_base(int mon_idx, bool detected)
     {
         // Use item tile
         item_def item = mitm[menv[mon_idx].inv[MSLOT_WEAPON]];
-        return tileidx_item(item);
+        return tileidx_item(item) | TILE_FLAG_ANIM_WEP; 
     }
 
     case MONS_TITAN:
diff --git a/crawl-ref/source/tile2.cc b/crawl-ref/source/tile2.cc
index dace6d104c..279e5bf378 100644
--- a/crawl-ref/source/tile2.cc
+++ b/crawl-ref/source/tile2.cc
@@ -726,6 +726,11 @@ void _tcache_compose_normal(int ix, int *fg, int *bg)
         status_shift += 5;
     }
 
+    if (fg0 & TILE_FLAG_ANIM_WEP)
+    {
+        _tcache_overlay(tcache_image, ix, TILE_ANIMATED_WEAPON, &c, NULL);
+    }
+
     if (bg0 & TILE_FLAG_UNSEEN)
     {
         _tcache_overlay(tcache_image, ix, TILE_MESH, &c, NULL);
diff --git a/crawl-ref/source/tiles.h b/crawl-ref/source/tiles.h
index d3cd951c6e..1ef45cff62 100644
--- a/crawl-ref/source/tiles.h
+++ b/crawl-ref/source/tiles.h
@@ -148,6 +148,7 @@ enum tile_flags
     TILE_FLAG_MAY_STAB  = 0x0000C000,
     TILE_FLAG_NET       = 0x00010000,
     TILE_FLAG_POISON    = 0x00020000,
+    TILE_FLAG_ANIM_WEP  = 0x00040000,
 
     // Background flags
     TILE_FLAG_RAY       = 0x00000800,