Forward-port vampire satiation fixes and cosmetic fixes from 0.5 r10447.

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

1 files changed, 4 insertions, 3 deletions

diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc
index c32f7c6b5d..916dacc00a 100644
--- a/crawl-ref/source/tilepick.cc
+++ b/crawl-ref/source/tilepick.cc
@@ -4408,19 +4408,20 @@ void tile_place_monster(int gx, int gy, int idx, bool foreground, bool detected)
     else
     {
         // Retain the magic mapped terrain, but don't give away the real
-        // features either.
+        // features.
         if (is_terrain_mapped(gc))
         {
             unsigned int feature = grd(gc);
 
             unsigned int grid_symbol;
-            unsigned short grid_color;
-            get_item_symbol(feature, &grid_symbol, &grid_color);
+            unsigned short grid_colour;
+            get_item_symbol(feature, &grid_symbol, &grid_colour);
 
             unsigned int fg;
             unsigned int bg;
             tileidx_unseen(fg, bg, grid_symbol, gc);
             env.tile_bk_bg(gc) = bg;
+//             env.tile_bk_bg(gc) = fg;
         }
         env.tile_bk_fg(gc) = t0;
     }