Skip to content

Commit

Permalink
fix empire serialization version checks (#4508)
Browse files Browse the repository at this point in the history
  • Loading branch information
geoffthemedio committed May 6, 2023
1 parent 5a8ef4a commit 404139c
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions util/SerializeEmpire.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ void Empire::serialize(Archive& ar, const unsigned int version)
ar & BOOST_SERIALIZATION_NVP(m_capital_id)
& BOOST_SERIALIZATION_NVP(m_source_id)
& BOOST_SERIALIZATION_NVP(m_eliminated);
if (Archive::is_loading::value && version < 12) {
if (Archive::is_loading::value && version < 13) {
std::set<std::string> victories;
ar & boost::serialization::make_nvp("m_victories", victories);
m_victories.clear();
Expand Down Expand Up @@ -215,7 +215,7 @@ void Empire::serialize(Archive& ar, const unsigned int version)
ar & boost::serialization::make_nvp("m_techs", techs);
m_techs.insert(boost::container::ordered_unique_range, techs.begin(), techs.end());

} else if (Archive::is_loading::value && version < 12) {
} else if (Archive::is_loading::value && version < 13) {
std::map<std::string, int, std::less<>> techs;
ar & boost::serialization::make_nvp("m_techs", techs);
m_techs.insert(boost::container::ordered_unique_range, techs.begin(), techs.end());
Expand Down Expand Up @@ -267,7 +267,7 @@ void Empire::serialize(Archive& ar, const unsigned int version)
ar & boost::serialization::make_nvp("m_meters", meters);
m_meters.insert(boost::container::ordered_unique_range, meters.begin(), meters.end());

} else if (Archive::is_loading::value && version < 12) {
} else if (Archive::is_loading::value && version < 13) {
std::vector<std::pair<std::string, Meter>> meters;
ar & boost::serialization::make_nvp("m_meters", meters);
std::sort(meters.begin(), meters.end());
Expand Down Expand Up @@ -303,7 +303,7 @@ void Empire::serialize(Archive& ar, const unsigned int version)
& BOOST_SERIALIZATION_NVP(m_production_queue)
& BOOST_SERIALIZATION_NVP(m_influence_queue);

if (Archive::is_loading::value && version < 12) {
if (Archive::is_loading::value && version < 13) {
std::set<std::string> buf;
ar & boost::serialization::make_nvp("m_available_building_types", buf);
m_available_building_types.insert(boost::container::ordered_unique_range, buf.begin(), buf.end());
Expand Down

0 comments on commit 404139c

Please sign in to comment.