diff options
Diffstat (limited to 'crawl-ref')
-rw-r--r-- | crawl-ref/source/files.cc | 18 | ||||
-rw-r--r-- | crawl-ref/source/tags.cc | 12 |
2 files changed, 0 insertions, 30 deletions
diff --git a/crawl-ref/source/files.cc b/crawl-ref/source/files.cc index 605284cde0..ce60021285 100644 --- a/crawl-ref/source/files.cc +++ b/crawl-ref/source/files.cc @@ -2090,9 +2090,6 @@ bool apply_to_all_dungeons(bool (*applicator)()) return (success); } -// XXX: Minor version renumbering hack. -bool _minor_renumbering_correction = false; - static bool _get_and_validate_version(FILE *restoreFile, char &major, char &minor, std::string* reason) { @@ -2127,21 +2124,6 @@ static bool _get_and_validate_version(FILE *restoreFile, char &major, return (false); } - // XXX: Temporary hack to avoid breaking savefile compatibility because - // of simply renumbering the minor-versions. Should be removed before - // 0.6 is released. 16 is the minor version which was introduced when - // the major version was bumped from 5 to 6. - COMPILE_CHECK(TAG_MINOR_VERSION < 16, c1); - if (minor >= 16) - { - mprf(MSGCH_WARN, - "Savefile minor version being changed from %d to %d " - "because of renumbering of minor versions after removing " - "0.5 minor versions.", minor, minor - 16); - minor -= 16; - _minor_renumbering_correction = true; - } - if (minor > TAG_MINOR_VERSION) { *reason = make_stringf("Minor version mismatch: %d (want <= %d).", diff --git a/crawl-ref/source/tags.cc b/crawl-ref/source/tags.cc index d807287649..25f19dc6cb 100644 --- a/crawl-ref/source/tags.cc +++ b/crawl-ref/source/tags.cc @@ -1343,9 +1343,6 @@ static void tag_construct_lost_items(writer &th) marshall_item_list ); } -// XXX: Minor version renumbering hack. -extern bool _minor_renumbering_correction; - static void tag_read_you(reader &th, char minorVersion) { char buff[20]; // For birth date. @@ -1488,15 +1485,6 @@ static void tag_read_you(reader &th, char minorVersion) for (j = 0; j < count_c; ++j) you.attribute[j] = unmarshallLong(th); - // XXX: Hack to preserve compatibility despite renumbering the - // minor versions. - if (_minor_renumbering_correction) - { - // old: quiver info. Discard it. - count_c = unmarshallByte(th); - ASSERT(count_c == 0); - } - count_c = unmarshallByte(th); for (j = 0; j < count_c; ++j) you.sacrifice_value[j] = unmarshallLong(th); |