diff options
Diffstat (limited to 'crawl-ref')
| -rw-r--r-- | crawl-ref/source/tags.cc | 15 | ||||
| -rw-r--r-- | crawl-ref/source/tags.h | 3 |
2 files changed, 7 insertions, 11 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); } } diff --git a/crawl-ref/source/tags.h b/crawl-ref/source/tags.h index 3ecacbbcd1..f9c3959299 100644 --- a/crawl-ref/source/tags.h +++ b/crawl-ref/source/tags.h @@ -47,8 +47,7 @@ enum tag_major_version enum tag_minor_version { TAG_MINOR_RESET = 0, // Minor tags were reset - TAG_MINOR_HEIGHTMAP = 1, - TAG_MINOR_VERSION = 1 // Current version. (Keep equal to max.) + TAG_MINOR_VERSION = 0 // Current version. (Keep equal to max.) }; struct enum_info |