Removed 0.5 savefile minor versions, renumbered

Removed the savefile minor versions which were introducded in 0.5, since
bumping the major version from 5 to 6 breaks compatibility with 0.5
savefiles.  Renumbered the 0.6 minor versions to start with 0.

This contains a hack to maintain compatibility with 0.6 savefiles before
the renumbering, a hack which should be removed before 0.6 is released.

1 files changed, 6 insertions, 8 deletions

diff --git a/crawl-ref/source/mapmark.cc b/crawl-ref/source/mapmark.cc
index 2a12913e28..794cfb74d5 100644
--- a/crawl-ref/source/mapmark.cc
+++ b/crawl-ref/source/mapmark.cc
@@ -804,21 +804,19 @@ void map_markers::write(writer &outf) const
 
 void map_markers::read(reader &inf, int minorVersion)
 {
+    UNUSED(minorVersion);
+
     clear();
 
-    if (minorVersion >= TAG_MINOR_MAPMARK)
-    {
-        const long cooky = unmarshallLong(inf);
-        ASSERT(cooky == MARKERS_COOKY);
-        UNUSED(cooky);
-    }
+    const long cooky = unmarshallLong(inf);
+    ASSERT(cooky == MARKERS_COOKY);
+    UNUSED(cooky);
 
     const int nmarkers = unmarshallShort(inf);
     for (int i = 0; i < nmarkers; ++i)
     {
         // used by tools
-        if (minorVersion >= TAG_MINOR_MAPMARK)
-            unmarshallLong(inf);
+        unmarshallLong(inf);
         if (map_marker *mark = map_marker::read_marker(inf))
         {
             add(mark);