Croak if necessary Lua files are missing, instead of failing subtly later.

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

3 files changed, 12 insertions, 9 deletions

diff --git a/crawl-ref/source/clua.cc b/crawl-ref/source/clua.cc
index 7e2c43a98a..63f901f051 100644
--- a/crawl-ref/source/clua.cc
+++ b/crawl-ref/source/clua.cc
@@ -229,7 +229,8 @@ bool CLua::is_path_safe(std::string s, bool trusted)
             && (trusted || s.find("clua") == std::string::npos));
 }
 
-int CLua::loadfile(lua_State *ls, const char *filename, bool trusted)
+int CLua::loadfile(lua_State *ls, const char *filename, bool trusted,
+                   bool die_on_fail)
 {
     if (!ls)
         return (-1);
@@ -242,11 +243,11 @@ int CLua::loadfile(lua_State *ls, const char *filename, bool trusted)
         return (-1);
     }
     
-    const std::string file = datafile_path(filename, false);
+    const std::string file = datafile_path(filename, die_on_fail);
     return (luaL_loadfile(ls, file.c_str()));
 }
 
-int CLua::execfile(const char *filename, bool trusted)
+int CLua::execfile(const char *filename, bool trusted, bool die_on_fail)
 {
     if (sourced_files.find(filename) != sourced_files.end())
         return 0;
@@ -254,7 +255,7 @@ int CLua::execfile(const char *filename, bool trusted)
     sourced_files.insert(filename);
 
     lua_State *ls = state();
-    int err = loadfile(ls, filename, trusted || !managed_vm);
+    int err = loadfile(ls, filename, trusted || !managed_vm, die_on_fail);
     lua_call_throttle strangler(this);
     if (!err)
         err = lua_pcall(ls, 0, 0, 0);
@@ -598,7 +599,7 @@ void CLua::init_lua()
         lua_register(_state, "loadfile", clua_loadfile);
         lua_register(_state, "dofile", clua_dofile);
 
-        execfile("clua/userbase.lua", true);
+        execfile("clua/userbase.lua", true, true);
     }
 }
 
@@ -613,7 +614,7 @@ void CLua::load_chooks()
 
 void CLua::load_cmacro()
 {
-    execfile("clua/macro.lua", true);
+    execfile("clua/macro.lua", true, true);
 }
 
 /////////////////////////////////////////////////////////////////////
diff --git a/crawl-ref/source/clua.h b/crawl-ref/source/clua.h
index 6759687494..2fd6bf835e 100644
--- a/crawl-ref/source/clua.h
+++ b/crawl-ref/source/clua.h
@@ -65,7 +65,8 @@ public:
 
     int loadstring(const char *str, const char *context);
     int execstring(const char *str, const char *context = "init.txt");
-    int execfile(const char *filename, bool trusted = false);
+    int execfile(const char *filename, bool trusted = false,
+                 bool die_on_fail = false);
 
     bool callbooleanfn(bool defval, const char *fn, const char *params, ...);
     bool callfn(const char *fn, int nargs, int nret = 1);
@@ -74,7 +75,8 @@ public:
     bool runhook(const char *hook, const char *params, ...);
 
     static int file_write(lua_State *ls);
-    static int loadfile(lua_State *ls, const char *file, bool trusted = false);
+    static int loadfile(lua_State *ls, const char *file,
+                        bool trusted = false, bool die_on_fail = false);
     static bool is_path_safe(std::string file, bool trusted = false);
 
 public:
diff --git a/crawl-ref/source/luadgn.cc b/crawl-ref/source/luadgn.cc
index 9b6ab6b04f..bdc5494275 100644
--- a/crawl-ref/source/luadgn.cc
+++ b/crawl-ref/source/luadgn.cc
@@ -579,7 +579,7 @@ static const struct luaL_reg dgn_lib[] =
 
 void init_dungeon_lua()
 {
-    dlua.execfile("clua/dungeon.lua");
+    dlua.execfile("clua/dungeon.lua", true, true);
     luaopen_debug(dlua);
     luaL_newmetatable(dlua, MAP_METATABLE);
     lua_pop(dlua, 1);