diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-07-01 11:19:26 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-07-01 11:19:26 +0000 |
| commit | 2b3c8ea80b120c791882a8391292dbdec5333664 (patch) | |
| tree | 842d034411b9758ab774763f491f2129429bfa39 /crawl-ref/source/util | |
| parent | 5e974fc5a77504a7af9b6ee35d4a8fe19f8ef0c3 (diff) | |
| download | crawl-ref-2b3c8ea80b120c791882a8391292dbdec5333664.tar.gz crawl-ref-2b3c8ea80b120c791882a8391292dbdec5333664.zip | |
Level updates collated by David.
Fixed DEPTH: not being read correctly, added more map validation.
Increased attack speed of ice statues.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1704 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/util')
| -rw-r--r-- | crawl-ref/source/util/levcomp.lpp | 2 | ||||
| -rw-r--r-- | crawl-ref/source/util/levcomp.ypp | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/crawl-ref/source/util/levcomp.lpp b/crawl-ref/source/util/levcomp.lpp index 9331f32e19..49a7456ecc 100644 --- a/crawl-ref/source/util/levcomp.lpp +++ b/crawl-ref/source/util/levcomp.lpp @@ -154,7 +154,7 @@ NSPACE [^\ \t\r\n] ^[ \t]*#.* ; -^\s*MAP { BEGIN(MAPDEF); } +^\s*MAP[ \t]*$ { BEGIN(MAPDEF); } ^[ \t]*: { BEGIN(LUA_ONELINER); return MAIN; } diff --git a/crawl-ref/source/util/levcomp.ypp b/crawl-ref/source/util/levcomp.ypp index f8a49b844d..136b03673c 100644 --- a/crawl-ref/source/util/levcomp.ypp +++ b/crawl-ref/source/util/levcomp.ypp @@ -87,6 +87,12 @@ definition : def {} | level {} ; +error_seq : CHARACTER + { + yyerror("Unexpected character sequence."); + } + ; + def : defdepth {} | global_lua {} ; @@ -170,6 +176,7 @@ metaline : place | prelude_lua | validate_lua | veto_lua + | error_seq {} ; global_lua : MAIN global_lua_lines { } |