Updated level-design.txt with a basic overview of the Lua possibilities.

Fixed some inconsistencies in the handling of Lua errors.
Tweaked the lexer to allow spaces before Lua chunk prefixes.

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

1 files changed, 7 insertions, 2 deletions

diff --git a/crawl-ref/source/maps.cc b/crawl-ref/source/maps.cc
index 8b89d52115..dd64467129 100644
--- a/crawl-ref/source/maps.cc
+++ b/crawl-ref/source/maps.cc
@@ -112,10 +112,15 @@ static int write_vault(map_def &mdef, map_type map,
 static bool resolve_map(map_def &map, const map_def &original)
 {
     map.reinit();
-    map.run_lua(true);
+    std::string err = map.run_lua(true);
+    if (!err.empty())
+    {
+        mprf(MSGCH_WARN, "Lua error: %s", err.c_str());
+        return (false);
+    }
     map.resolve();
 
-    if (!map.test_lua_validate())
+    if (!map.test_lua_validate(false))
         return (false);
     
     // Mirroring is possible for any map that does not explicitly forbid it.