Add trap_item_brand that behaves like stair_item_brand.

Defaults to 'none'. (FR 1793669)


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

1 files changed, 10 insertions, 1 deletions

diff --git a/crawl-ref/source/view.cc b/crawl-ref/source/view.cc
index 62d5fea95f..13dd0d5ffb 100644
--- a/crawl-ref/source/view.cc
+++ b/crawl-ref/source/view.cc
@@ -258,6 +258,8 @@ static unsigned colflag2brand(int colflag)
         return (Options.may_stab_brand);
     case COLFLAG_STAIR_ITEM:
         return (Options.stair_item_brand);
+    case COLFLAG_TRAP_ITEM:
+        return (Options.trap_item_brand);
     default:
         return (CHATTR_NORMAL);
     }
@@ -552,7 +554,12 @@ screen_buffer_t colour_code_map( int x, int y, bool item_colour,
     {
         tc |= COLFLAG_STAIR_ITEM;
     }
-
+    else if (Options.trap_item_brand
+	     && grid_is_trap(grid_value) && igrd[x][y] != NON_ITEM)
+    {
+	tc |= COLFLAG_TRAP_ITEM;
+    }
+    
     return real_colour(tc);
 }
 
@@ -1190,6 +1197,8 @@ inline static void update_item_grid(const coord_def &gp, const coord_def &ep)
     const dungeon_feature_type grid = grd(gp);
     if (Options.stair_item_brand && is_stair(grid))
         ecol |= COLFLAG_STAIR_ITEM;
+    else if (Options.trap_item_brand && grid_is_trap(grid))
+        ecol |= COLFLAG_TRAP_ITEM;
     else
     {
         ecol = (grid == DNGN_SHALLOW_WATER)? CYAN : eitem.colour;