Allow "none" alternatives to work with TILE: and friends.

The level-making documentation gave a few examples using "/ none", but
that did not work correctly and could lead to crashes (depending on
uninitialised variables).

1 files changed, 3 insertions, 3 deletions

diff --git a/crawl-ref/source/mapdef.cc b/crawl-ref/source/mapdef.cc
index 4f71a41e05..6d7fee8b5b 100644
--- a/crawl-ref/source/mapdef.cc
+++ b/crawl-ref/source/mapdef.cc
@@ -610,7 +610,7 @@ void map_lines::apply_grid_overlay(const coord_def &c)
 
             bool has_floor = false, has_rock = false;
             string name = (*overlay)(x, y).floortile;
-            if (!name.empty())
+            if (!name.empty() && name != "none")
             {
                 env.tile_flv(gc).floor_idx =
                     store_tilename_get_index(name);
@@ -625,7 +625,7 @@ void map_lines::apply_grid_overlay(const coord_def &c)
             }
 
             name = (*overlay)(x, y).rocktile;
-            if (!name.empty())
+            if (!name.empty() && name != "none")
             {
                 env.tile_flv(gc).wall_idx =
                     store_tilename_get_index(name);
@@ -640,7 +640,7 @@ void map_lines::apply_grid_overlay(const coord_def &c)
             }
 
             name = (*overlay)(x, y).tile;
-            if (!name.empty())
+            if (!name.empty() && name != "none")
             {
                 env.tile_flv(gc).feat_idx =
                     store_tilename_get_index(name);