TAG_MINOR_PIETY    =  2,     // Added piety_hysteresis
    TAG_MINOR_QUIVER   =  3,     // Added quiver
    TAG_MINOR_MAPMARK  =  4,     // Added sizes to map markers
    TAG_MINOR_MONNAM   =  5,     // Monsters get individual names
    TAG_MINOR_MONBASE  =  6,     // Zombie base monster gets its own field.
    TAG_MINOR_FPICKUP  =  7,     // Added pickup option for allied monsters.
    TAG_MINOR_MPATROL  =  8,     // Added monster patrol points.
    TAG_MINOR_PATHFIND =  9,     // Added monster pathfinding.
    TAG_MINOR_TRTARGET = 10,     // Added travel target.
    TAG_MINOR_LUADGN   = 11,     // Allow dungeon Lua to persist data.
    // Bump version past 12.
    TAG_MINOR_SVNREV   = 13,     // Added SVN revision
    TAG_MINOR_PORTEXT  = 14,     // Keep track of portal vault extensions.
    TAG_MINOR_RELIGION = 15,     // Keep track of ghosts' religions.
    // XXX: Release 0.5 -> switch to major version 6
    // Does that mean we can remove all the above minor version checks?
    TAG_MINOR_ARTEFACT = 16,     // Turned fixed arts into unrandarts.
    TAG_MINOR_JIYVA    = 17,     // Added some player bits for Jiyva.
    TAG_MINOR_ZOT_OPEN = 18,     // Remember whether Zot was opened.
    TAG_MINOR_JELLY    = 19,     // Remember whether the royal jelly is dead.
    TAG_ANNOTATE_EXCL  = 20,     // Store exclusion information for annotations.
    TAG_MINOR_UGLY     = 21,     // More ghost bits for (very) ugly things.
    TAG_MINOR_ROTTING  = 22,     // Added monster-specific rotting resistance.
    TAG_MINOR_TRANS    = 23,     // Keep track of cancellable transformations.
    TAG_MINOR_GITREV   = 24,     // Removed SVN revision and added Git revision.
    TAG_MINOR_VERSION  = 24      // Current version.  (Keep equal to max.)

    TAG_MINOR_ARTEFACT =  0,     // Turned fixed arts into unrandarts.
    TAG_MINOR_JIYVA    =  1,     // Added some player bits for Jiyva.
    TAG_MINOR_ZOT_OPEN =  2,     // Remember whether Zot was opened.
    TAG_MINOR_JELLY    =  3,     // Remember whether the royal jelly is dead.
    TAG_ANNOTATE_EXCL  =  4,     // Store exclusion information for annotations.
    TAG_MINOR_UGLY     =  5,     // More ghost bits for (very) ugly things.
    TAG_MINOR_ROTTING  =  6,     // Added monster-specific rotting resistance.
    TAG_MINOR_TRANS    =  7,     // Keep track of cancellable transformations.
    TAG_MINOR_GITREV   =  8,     // Removed SVN revision and added Git revision.
    TAG_MINOR_VERSION  =  8      // Current version.  (Keep equal to max.)

    // Was: remembered quiver items.
    marshallByte(th, 0);

    // minorVersion TAG_MINOR_PIETY starts here

    // minorVersion TAG_MINOR_QUIVER starts here

    // minorVersion TAG_MINOR_FPICKUP starts here

    // minorVersion TAG_MINOR_LUADGN starts here

    // minorVersion TAG_MINOR_GITREV starts here

// XXX: Minor version renumbering hack.
extern bool _minor_renumbering_correction;

    if (minorVersion >= TAG_MINOR_LUADGN)
    {
        you.level_type_name_abbrev = unmarshallString(th);
        you.level_type_origin      = unmarshallString(th);
        you.level_type_tag         = unmarshallString(th);

        if (minorVersion >= TAG_MINOR_PORTEXT)
            you.level_type_ext = unmarshallString(th);
    }

    you.level_type_name_abbrev = unmarshallString(th);
    you.level_type_origin      = unmarshallString(th);
    you.level_type_tag         = unmarshallString(th);
    you.level_type_ext         = unmarshallString(th);

    // old: quiver info.  Discard it.
    count_c = unmarshallByte(th);
    if (minorVersion >= TAG_MINOR_QUIVER)

    // XXX: Hack to preserve compatibility despite renumbering the
    // minor versions.
    if (_minor_renumbering_correction)
    {
        // old: quiver info.  Discard it.
        count_c = unmarshallByte(th);

    for (j = 0; j < count_c; ++j)
        unmarshallByte(th);

    }

    if (minorVersion >= TAG_MINOR_PIETY)
        you.piety_hysteresis = unmarshallByte(th);

    you.piety_hysteresis = unmarshallByte(th);

    if (minorVersion >= TAG_MINOR_QUIVER)
        you.m_quiver->load(th);

    you.m_quiver->load(th);

    if (minorVersion >= TAG_MINOR_FPICKUP)
        you.friendly_pickup = unmarshallByte(th);

    you.friendly_pickup = unmarshallByte(th);

    if (minorVersion >= TAG_MINOR_LUADGN)
    {
        if (!dlua.callfn("dgn_load_data", "u", &th))
            mprf(MSGCH_ERROR, "Failed to load Lua persist table: %s",
                 dlua.error.c_str());
    }

    if (!dlua.callfn("dgn_load_data", "u", &th))
        mprf(MSGCH_ERROR, "Failed to load Lua persist table: %s",
             dlua.error.c_str());

    if (minorVersion >= TAG_MINOR_SVNREV &&
        minorVersion <  TAG_MINOR_GITREV)

    if (minorVersion <  TAG_MINOR_GITREV)

    if (_tag_minor_version >= TAG_MINOR_MONNAM)
        m.mname = unmarshallString(th, 100);

    m.mname           = unmarshallString(th, 100);

    if (_tag_minor_version >= TAG_MINOR_MPATROL)
        unmarshallCoord(th, m.patrol_point);

    unmarshallCoord(th, m.patrol_point);

    if (_tag_minor_version >= TAG_MINOR_TRTARGET)
    {
        int help = unmarshallByte(th);
        m.travel_target = static_cast<montravel_target_type>(help);
    }

    int help = unmarshallByte(th);
    m.travel_target = static_cast<montravel_target_type>(help);

    if (_tag_minor_version >= TAG_MINOR_PATHFIND)

    const int len = unmarshallShort(th);
    for (int i = 0; i < len; ++i)

        const int len = unmarshallShort(th);
        for (int i = 0; i < len; ++i)
        {
            coord_def c;
            unmarshallCoord(th, c);
            m.travel_path.push_back(c);
        }

        coord_def c;
        unmarshallCoord(th, c);
        m.travel_path.push_back(c);

    m.flags           = unmarshallLong(th);
    m.experience      = static_cast<unsigned long>(unmarshallLong(th));

    m.flags      = unmarshallLong(th);
    m.experience = static_cast<unsigned long>(unmarshallLong(th));

    if (_tag_minor_version >= TAG_MINOR_MONBASE)
        m.base_monster = static_cast<monster_type>(unmarshallShort(th));
    else
        m.base_monster = static_cast<monster_type>(m.number);

    m.base_monster   = static_cast<monster_type>(unmarshallShort(th));

    if (minorVersion >= TAG_MINOR_RELIGION)
        ghost.religion     = static_cast<god_type>( unmarshallByte(th) );

    ghost.religion         = static_cast<god_type>( unmarshallByte(th) );

    UNUSED(minorVersion);

    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);

        if (minorVersion >= TAG_MINOR_MAPMARK)
            unmarshallLong(inf);

        unmarshallLong(inf);

static bool _get_and_validate_version(FILE *restoreFile, char &major, char &minor,
                                      std::string* reason)

// 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)

    // NOTE: This is a hacky replacement for what should have been caught
    // by MAJOR_VERSION above. Once the next major version update happens
    // (preferably when saves break with 0.5 -> 0.6) this check will need
    // to be removed.
    if (minor < TAG_MINOR_RELIGION)

    if (minor < 0)

        *reason = "Sorry, but 0.4.x save and bones files are incompatible "
                  "with 0.5!";

        *reason = make_stringf("Minor version %d is negative!",
                               minor);

    }
    // 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;