summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/maps.h
diff options
context:
space:
mode:
authordshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-07-08 14:20:44 +0000
committerdshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-07-08 14:20:44 +0000
commit8fda0acad5c6c6bf377684d2c14de56ea2e77adf (patch)
treeca6f9ca80d911f17e3ac9543230bb25d1f9fe225 /crawl-ref/source/maps.h
parentcb8c16f0c7b880d19b9e6f38b8ac697d8c2f885d (diff)
downloadcrawl-ref-8fda0acad5c6c6bf377684d2c14de56ea2e77adf.tar.gz
crawl-ref-8fda0acad5c6c6bf377684d2c14de56ea2e77adf.zip
Fixed level-compiler not warning of maps with the same name consistently.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1799 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/maps.h')
-rw-r--r--crawl-ref/source/maps.h17
1 files changed, 10 insertions, 7 deletions
diff --git a/crawl-ref/source/maps.h b/crawl-ref/source/maps.h
index 5fdc288f95..dd38701b68 100644
--- a/crawl-ref/source/maps.h
+++ b/crawl-ref/source/maps.h
@@ -53,13 +53,16 @@ void reset_map_parser();
std::string get_descache_path(const std::string &file,
const std::string &ext);
-extern std::string lc_desfile;
-extern map_def lc_map;
-extern level_range lc_range;
-extern depth_ranges lc_default_depths;
-extern dlua_chunk lc_global_prelude;
-extern bool lc_run_global_prelude;
+typedef std::map<std::string, map_file_place> map_load_info_t;
-const int MAP_CACHE_VERSION = 1004;
+extern map_load_info_t lc_loaded_maps;
+extern std::string lc_desfile;
+extern map_def lc_map;
+extern level_range lc_range;
+extern depth_ranges lc_default_depths;
+extern dlua_chunk lc_global_prelude;
+extern bool lc_run_global_prelude;
+
+const int MAP_CACHE_VERSION = 1005;
#endif