diff options
| author | Robert Vollmert <rvollmert@gmx.net> | 2009-11-03 18:34:05 +0100 |
|---|---|---|
| committer | Robert Vollmert <rvollmert@gmx.net> | 2009-11-03 18:36:39 +0100 |
| commit | edad265ebe7fb18affd4c759b1e3d8ab48cb9636 (patch) | |
| tree | 2b70e471086328557899d22a02ffd9f384082641 | |
| parent | 01f2ad3d1aeec6264015ffdf7965965eab94d745 (diff) | |
| download | crawl-ref-edad265ebe7fb18affd4c759b1e3d8ab48cb9636.tar.gz crawl-ref-edad265ebe7fb18affd4c759b1e3d8ab48cb9636.zip | |
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.
| -rw-r--r-- | crawl-ref/source/maps.cc | 2 |
1 files changed, 1 insertions, 1 deletions
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); |