From edad265ebe7fb18affd4c759b1e3d8ab48cb9636 Mon Sep 17 00:00:00 2001 From: Robert Vollmert Date: Tue, 3 Nov 2009 18:34:05 +0100 Subject: Make parse_maps not call end() when reading old .des files. Instead, it just returns without doing anything. I don't know why the call to end() was there in the first place. May well be missing something but this change hasn't had any obvious bad effects for me. This was causing problems with different tests trying to load the same .des file multiple times. --- crawl-ref/source/maps.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'crawl-ref/source/maps.cc') diff --git a/crawl-ref/source/maps.cc b/crawl-ref/source/maps.cc index 6540c05401..2c7060f31b 100644 --- a/crawl-ref/source/maps.cc +++ b/crawl-ref/source/maps.cc @@ -914,7 +914,7 @@ static void parse_maps(const std::string &s) { const std::string base = get_base_filename(s); if (map_files_read.find(base) != map_files_read.end()) - end(1, false, "Map file %s has already been read.", base.c_str()); + return; map_files_read.insert(base); -- cgit v1.2.3-54-g00ecf