Don't overwrite primary vault tiles with layout tiles (#8108, #6150)

The remaining problem behind this longstanding bug was that the layout
overwrote the colour, height, tiles, etc. of all squares---even ones that
were already placed by the primary vault.

1 files changed, 5 insertions, 3 deletions

diff --git a/crawl-ref/source/mapdef.cc b/crawl-ref/source/mapdef.cc
index 1fe5a41463..24982bf68e 100644
--- a/crawl-ref/source/mapdef.cc
+++ b/crawl-ref/source/mapdef.cc
@@ -579,7 +579,7 @@ void map_lines::apply_markers(const coord_def &c)
     markers.clear();
 }
 
-void map_lines::apply_grid_overlay(const coord_def &c)
+void map_lines::apply_grid_overlay(const coord_def &c, bool is_layout)
 {
     if (!overlay.get())
         return;
@@ -588,6 +588,8 @@ void map_lines::apply_grid_overlay(const coord_def &c)
         for (int x = width() - 1; x >= 0; --x)
         {
             coord_def gc(c.x + x, c.y + y);
+            if (is_layout && map_masked(gc, MMT_VAULT))
+                continue;
 
             const int colour = (*overlay)(x, y).colour;
             if (colour)
@@ -671,10 +673,10 @@ void map_lines::apply_grid_overlay(const coord_def &c)
         }
 }
 
-void map_lines::apply_overlays(const coord_def &c)
+void map_lines::apply_overlays(const coord_def &c, bool is_layout)
 {
     apply_markers(c);
-    apply_grid_overlay(c);
+    apply_grid_overlay(c, is_layout);
 }
 
 const vector<string> &map_lines::get_lines() const