summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/maps.cc
diff options
context:
space:
mode:
Diffstat (limited to 'crawl-ref/source/maps.cc')
-rw-r--r--crawl-ref/source/maps.cc9
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.