diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-08-15 18:44:14 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-08-15 18:44:14 +0000 |
| commit | 54f595ca30391a4e95ae1f46706d9c7cc5a6b6a8 (patch) | |
| tree | 768876b87074ecf753d9fe39250df669240c4500 | |
| parent | 4b21d1d60d5d7623ba938a57a4741d8e2d0caf9b (diff) | |
| download | crawl-ref-54f595ca30391a4e95ae1f46706d9c7cc5a6b6a8.tar.gz crawl-ref-54f595ca30391a4e95ae1f46706d9c7cc5a6b6a8.zip | |
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
| -rw-r--r-- | crawl-ref/source/initfile.cc | 14 | ||||
| -rw-r--r-- | crawl-ref/source/makefile.unix | 1 |
2 files changed, 4 insertions, 11 deletions
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") diff --git a/crawl-ref/source/makefile.unix b/crawl-ref/source/makefile.unix index 7563a43c4c..bd3c82a7ba 100644 --- a/crawl-ref/source/makefile.unix +++ b/crawl-ref/source/makefile.unix @@ -218,6 +218,7 @@ endif mkdir -p $(DATADIR)/dat/clua cp dat/*.des $(DATADIR)/dat cp dat/*.txt $(DATADIR)/dat + cp -r dat/descript $(DATADIR)/dat cp dat/clua/*.lua $(DATADIR)/dat/clua cp -r lua $(DATADIR)/dat mkdir -p $(DATADIR)/docs |