[1742338] Fixed Hell portals not being revealed correctly when the horn is

sounded.

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

1 files changed, 20 insertions, 3 deletions

diff --git a/crawl-ref/source/util/levcomp.ypp b/crawl-ref/source/util/levcomp.ypp
index 4a319c94f4..f8a49b844d 100644
--- a/crawl-ref/source/util/levcomp.ypp
+++ b/crawl-ref/source/util/levcomp.ypp
@@ -66,7 +66,7 @@ level_range set_range(const char *s, int start, int end)
 %expect 2
 
 %token <i>      DEFAULT_DEPTH SHUFFLE SUBST TAGS KFEAT KITEM KMONS
-%token <i>      NAME DEPTH ORIENT PLACE CHANCE MONS ITEM
+%token <i>      NAME DEPTH ORIENT PLACE CHANCE MONS ITEM MARKER
 %token <i>      PRELUDE MAIN VALIDATE VETO
 
 %token <i>      COMMA INTEGER CHARACTER
@@ -159,9 +159,10 @@ metaline        : place
                 | orientation
                 | mons
                 | items
+                | marker
                 | subst
-                | tags
                 | shuffle
+                | tags
                 | kfeat
                 | kitem
                 | kmons
@@ -284,6 +285,22 @@ tagstring       : STRING
                 }
                 ;
 
+marker          : MARKER marker_specs { }
+                ;
+
+marker_specs    : marker_spec                       { }
+                | marker_specs COMMA marker_spec    { }
+                ;
+
+marker_spec     : ITEM_INFO
+                {
+                    lc_map.main.add(
+                        yylineno,
+                        make_stringf("marker(\"%s\")",
+                            quote_lua_string($1).c_str()));
+                }
+                ;
+
 subst           : SUBST subst_specifiers { }
                 ;
 
@@ -304,7 +321,7 @@ items           : ITEM {}
                 | ITEM item_specifiers {}
                 ;
 
-item_specifiers : item_specifier COMMA item_specifiers
+item_specifiers : item_specifiers COMMA item_specifier
                 | item_specifier
                 ;