Monster status icons

1 files changed, 12 insertions, 12 deletions

diff --git a/crawl-ref/source/tiledgnbuf.cc b/crawl-ref/source/tiledgnbuf.cc
index 0ecdc69284..220d65e090 100644
--- a/crawl-ref/source/tiledgnbuf.cc
+++ b/crawl-ref/source/tiledgnbuf.cc
@@ -333,10 +333,10 @@ void DungeonCellBuffer::pack_foreground(int x, int y, const packed_cell &cell)
     default: ;
     }
 
+    //The berserk icon is in the lower right, so status_shift doesn't need changing.
     if (fg & TILE_FLAG_BERSERK)
     {
         m_buf_icons.add(TILEI_BERSERK, x, y);
-        status_shift += 10;
     }
 
     // Pet mark
@@ -351,12 +351,12 @@ void DungeonCellBuffer::pack_foreground(int x, int y, const packed_cell &cell)
         else if (att_flag == TILE_FLAG_GD_NEUTRAL)
         {
             m_buf_icons.add(TILEI_GOOD_NEUTRAL, x, y);
-            status_shift += 8;
+            status_shift += 7;
         }
         else if (att_flag == TILE_FLAG_NEUTRAL)
         {
             m_buf_icons.add(TILEI_NEUTRAL, x, y);
-            status_shift += 8;
+            status_shift += 7;
         }
     }
 
@@ -366,17 +366,17 @@ void DungeonCellBuffer::pack_foreground(int x, int y, const packed_cell &cell)
         if (beh_flag == TILE_FLAG_STAB)
         {
             m_buf_icons.add(TILEI_STAB_BRAND, x, y);
-            status_shift += 15;
+            status_shift += 12;
         }
         else if (beh_flag == TILE_FLAG_MAY_STAB)
         {
             m_buf_icons.add(TILEI_MAY_STAB_BRAND, x, y);
-            status_shift += 8;
+            status_shift += 7;
         }
         else if (beh_flag == TILE_FLAG_FLEEING)
         {
             m_buf_icons.add(TILEI_FLEEING, x, y);
-            status_shift += 4;
+            status_shift += 3;
         }
     }
 
@@ -388,17 +388,17 @@ void DungeonCellBuffer::pack_foreground(int x, int y, const packed_cell &cell)
     if (fg & TILE_FLAG_STICKY_FLAME)
     {
         m_buf_icons.add(TILEI_STICKY_FLAME, x, y, -status_shift, 0);
-        status_shift += 5;
+        status_shift += 7;
     }
     if (fg & TILE_FLAG_INNER_FLAME)
     {
         m_buf_icons.add(TILEI_INNER_FLAME, x, y, -status_shift, 0);
-        status_shift += 8;
+        status_shift += 7;
     }
     if (fg & TILE_FLAG_CONSTRICTED)
     {
         m_buf_icons.add(TILEI_CONSTRICTED, x, y, -status_shift, 0);
-        status_shift += 13;
+        status_shift += 11;
     }
     if (fg & TILE_FLAG_GLOWING)
     {
@@ -406,17 +406,17 @@ void DungeonCellBuffer::pack_foreground(int x, int y, const packed_cell &cell)
         //    m_buf_feat.add(TILE_HALO, x, y);
 
         m_buf_icons.add(TILEI_GLOWING, x, y, -status_shift, 0);
-        status_shift += 10;
+        status_shift += 7;
     }
     if (fg & TILE_FLAG_SLOWED)
     {
         m_buf_icons.add(TILEI_SLOWED, x, y, -status_shift, 0);
-        status_shift += 11;
+        status_shift += 6;
     }
     if (fg & TILE_FLAG_PAIN_MIRROR)
     {
         m_buf_icons.add(TILEI_PAIN_MIRROR, x, y, -status_shift, 0);
-        status_shift += 13;
+        status_shift += 7;
     }
 
     if (fg & TILE_FLAG_ANIM_WEP)