summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/maps.cc
diff options
context:
space:
mode:
authordshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-06-29 11:58:54 +0000
committerdshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-06-29 11:58:54 +0000
commitf0229aa5f1ecc1f23dcaa987075b9207784e9b91 (patch)
tree5916c258f2c103336cc470627873fc42b9749ec4 /crawl-ref/source/maps.cc
parent7d9814f3cbe24c356c75cf0363464303961ece59 (diff)
downloadcrawl-ref-f0229aa5f1ecc1f23dcaa987075b9207784e9b91.tar.gz
crawl-ref-f0229aa5f1ecc1f23dcaa987075b9207784e9b91.zip
Moved the list of required .des files into loadmaps.lua.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1687 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/maps.cc')
-rw-r--r--crawl-ref/source/maps.cc16
1 files changed, 8 insertions, 8 deletions
diff --git a/crawl-ref/source/maps.cc b/crawl-ref/source/maps.cc
index dd64467129..11eb43412f 100644
--- a/crawl-ref/source/maps.cc
+++ b/crawl-ref/source/maps.cc
@@ -575,16 +575,16 @@ static void parse_maps(const std::string &s)
write_map_cache(s, file_start, vdefs.size());
}
-void read_maps()
+void read_map(const std::string &file)
{
- static const char *map_files[] =
- {
- "entry.des", "splev.des", "vaults.des", "ebranch.des"
- };
-
- for (unsigned i = 0; i < ARRAYSIZE(map_files); ++i)
- parse_maps( lc_desfile = datafile_path( map_files[i] ) );
+ parse_maps( lc_desfile = datafile_path(file) );
+}
+void read_maps()
+{
+ if (dlua.execfile("clua/loadmaps.lua", true, true))
+ end(1, false, "Lua error: %s", dlua.error.c_str());
+
for (int i = 0, size = Options.extra_levels.size(); i < size; ++i)
{
lc_desfile = datafile_path( Options.extra_levels[i] + ".des", false );