summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/tags.cc
diff options
context:
space:
mode:
authorDarshan Shaligram <dshaligram@users.sourceforge.net>2009-12-27 20:02:40 +0530
committerDarshan Shaligram <dshaligram@users.sourceforge.net>2009-12-27 20:02:40 +0530
commit8b00e0051117ac616b658fddddfc61451aaf5e74 (patch)
treec0eb44727d4da140ff40c306cc49b08301ac428f /crawl-ref/source/tags.cc
parent23929ee3b2452b1c3a133061eff44b31dc70fb09 (diff)
downloadcrawl-ref-8b00e0051117ac616b658fddddfc61451aaf5e74.tar.gz
crawl-ref-8b00e0051117ac616b658fddddfc61451aaf5e74.zip
Reset tag minor version, since major version has been incremented (due).
Diffstat (limited to 'crawl-ref/source/tags.cc')
-rw-r--r--crawl-ref/source/tags.cc15
1 files changed, 6 insertions, 9 deletions
diff --git a/crawl-ref/source/tags.cc b/crawl-ref/source/tags.cc
index 8a90a4ee00..6d12c323ab 100644
--- a/crawl-ref/source/tags.cc
+++ b/crawl-ref/source/tags.cc
@@ -2236,16 +2236,13 @@ static void tag_read_level( reader &th, char minorVersion )
// Restore heightmap
env.heightmap.reset(NULL);
- if (_tag_minor_version >= TAG_MINOR_HEIGHTMAP)
+ const bool have_heightmap(unmarshallByte(th));
+ if (have_heightmap)
{
- const bool have_heightmap(unmarshallByte(th));
- if (have_heightmap)
- {
- env.heightmap.reset(new grid_heightmap);
- grid_heightmap &heightmap(*env.heightmap);
- for (rectangle_iterator ri(0); ri; ++ri)
- heightmap(*ri) = unmarshallShort(th);
- }
+ env.heightmap.reset(new grid_heightmap);
+ grid_heightmap &heightmap(*env.heightmap);
+ for (rectangle_iterator ri(0); ri; ++ri)
+ heightmap(*ri) = unmarshallShort(th);
}
}