summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-10-25 18:49:25 +0000
committerdshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-10-25 18:49:25 +0000
commit642ff844f06bf57d40323de5a42d3b527c306748 (patch)
treeaf71b57c0cc32f1186924b86edac2b888f3d1ae7
parentc74d8c41878cff22751311e0c631d22114f1417b (diff)
downloadcrawl-ref-642ff844f06bf57d40323de5a42d3b527c306748.tar.gz
crawl-ref-642ff844f06bf57d40323de5a42d3b527c306748.zip
Trunk->0.3 merge: Lua dofile fix (doy).
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.3@2579 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r--crawl-ref/source/clua.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/crawl-ref/source/clua.cc b/crawl-ref/source/clua.cc
index 7fb5f104eb..e7b8e524d7 100644
--- a/crawl-ref/source/clua.cc
+++ b/crawl-ref/source/clua.cc
@@ -257,7 +257,11 @@ int CLua::loadfile(lua_State *ls, const char *filename, bool trusted,
std::string file = datafile_path(filename, die_on_fail);
if (file.empty())
- file = filename;
+ {
+ lua_pushstring(ls,
+ make_stringf("Can't find \"%s\"", filename).c_str());
+ return (-1);
+ }
return (luaL_loadfile(ls, file.c_str()));
}