From 54f595ca30391a4e95ae1f46706d9c7cc5a6b6a8 Mon Sep 17 00:00:00 2001 From: dshaligram Date: Wed, 15 Aug 2007 18:44:14 +0000 Subject: Fixed lua_file not being processed correctly when Crawl is installed with make install. Fixed makefile.unix to copy description text files to the right places. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2004 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/initfile.cc | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'crawl-ref/source/initfile.cc') diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc index 34437eb81b..c7c762b932 100644 --- a/crawl-ref/source/initfile.cc +++ b/crawl-ref/source/initfile.cc @@ -1670,17 +1670,9 @@ void game_options::read_option_line(const std::string &str, bool runscript) else if (key == "lua_file" && runscript) { #ifdef CLUA_BINDINGS - const std::string lua_file = datafile_path(field, false, true); - if (lua_file.empty()) - { - fprintf(stderr, "Unable to find lua file: %s\n", field.c_str()); - } - else - { - clua.execfile(lua_file.c_str()); - if (!clua.error.empty()) - mprf(MSGCH_WARN, "Lua error: %s\n", clua.error.c_str()); - } + clua.execfile(field.c_str(), false, false); + if (!clua.error.empty()) + mprf(MSGCH_WARN, "Lua error: %s\n", clua.error.c_str()); #endif } else if (key == "colour" || key == "color") -- cgit v1.2.3-54-g00ecf