Convert dgn.set_border_fill_type to BORDER.

The Lua prelude of maps isn't executed early enough now. Using 'BORDER'
sets map->border_fill_type as soon as the map is read, rather than after
it is placed.

This commit increases the value of MAP_CACHE_VERSION.

Can be reverted if it causes issues or is unwanted.

2 files changed, 11 insertions, 0 deletions

diff --git a/crawl-ref/source/util/levcomp.lpp b/crawl-ref/source/util/levcomp.lpp
index 151ef1418e..10db92e912 100644
--- a/crawl-ref/source/util/levcomp.lpp
+++ b/crawl-ref/source/util/levcomp.lpp
@@ -249,6 +249,7 @@ LFLOORCOL:          { CBEGIN(ARGUMENT); return LFLOORCOL; }
 LROCKCOL:           { CBEGIN(ARGUMENT); return LROCKCOL; }
 LFLOORTILE:         { CBEGIN(ARGUMENT); return LFLOORTILE; }
 LROCKTILE:          { CBEGIN(ARGUMENT); return LROCKTILE; }
+BORDER:             { CBEGIN(ARGUMENT); return BORDER; }
 FTILE:              { CBEGIN(ITEM_LIST); return FTILE; }
 RTILE:              { CBEGIN(ITEM_LIST); return RTILE; }
 MONS:               { CBEGIN(MNAME); return MONS; }
diff --git a/crawl-ref/source/util/levcomp.ypp b/crawl-ref/source/util/levcomp.ypp
index f13f102da0..ad0335b5a3 100644
--- a/crawl-ref/source/util/levcomp.ypp
+++ b/crawl-ref/source/util/levcomp.ypp
@@ -55,6 +55,7 @@ level_range set_range(const char *s, int start, int end)
 %token <i>      NAME DEPTH ORIENT PLACE CHANCE WEIGHT MONS ITEM MARKER COLOUR
 %token <i>      PRELUDE MAIN VALIDATE VETO NSUBST WELCOME LFLAGS BFLAGS
 %token <i>      LFLOORCOL LROCKCOL LFLOORTILE LROCKTILE FTILE RTILE SUBVAULT
+%token <i>      BORDER
 
 %token <i>      COMMA COLON PERC INTEGER CHARACTER
 
@@ -164,6 +165,7 @@ metaline        : place
                 | lrockcol
                 | lfloortile
                 | lrocktile
+                | border
                 | ftile
                 | rtile
                 | shuffle
@@ -404,6 +406,14 @@ lrocktile       : LROCKTILE { }
                             quote_lua_string($2).c_str()));
                 }
 
+border          : BORDER { }
+                | BORDER STRING
+                {
+                    lc_map.main.add(
+                        yylineno,
+                        make_stringf("border(\"%s\")",
+                            quote_lua_string($2).c_str()));
+                }
 
 ftile           : FTILE ftile_specifiers
                 ;