Remove save format support older than 0.9.12

src/fheroes2/campaign/campaign_savedata.cpp

@@ -132,23 +132,6 @@ namespace Campaign
                >> data._daysPassed >> data._obtainedCampaignAwards >> data._carryOverTroops;
     }
 
-    void CampaignSaveData::loadOldSaveSata( StreamBase & msg, CampaignSaveData & data )
-    {
-        static_assert( LAST_SUPPORTED_FORMAT_VERSION < FORMAT_VERSION_0912_RELEASE, "Remove this method." );
-
-        msg >> data._currentScenarioInfoId.scenarioId >> data._currentScenarioBonus;
-
-        std::vector<int> finishedMaps;
-        msg >> finishedMaps;
-
-        msg >> data._currentScenarioInfoId.campaignId >> data._daysPassed >> data._obtainedCampaignAwards >> data._carryOverTroops;
-
-        data._finishedMaps.clear();
-        for ( const int mapId : finishedMaps ) {
-            data._finishedMaps.emplace_back( data._currentScenarioInfoId.campaignId, mapId );
-        }
-    }
-
     ScenarioVictoryCondition getCurrentScenarioVictoryCondition()
     {
         const CampaignSaveData & campaignData = CampaignSaveData::Get();

src/fheroes2/campaign/campaign_savedata.h

@@ -91,8 +91,6 @@ namespace Campaign
 
         static CampaignSaveData & Get();
 
-        static void loadOldSaveSata( StreamBase & msg, CampaignSaveData & data );
-
     private:
         friend StreamBase & operator<<( StreamBase & msg, const CampaignSaveData & data );
         friend StreamBase & operator>>( StreamBase & msg, CampaignSaveData & data );

src/fheroes2/game/game_io.cpp

@@ -237,13 +237,7 @@ fheroes2::GameMode Game::Load( const std::string & fn )
 
     if ( conf.isCampaignGameType() ) {
         Campaign::CampaignSaveData & saveData = Campaign::CampaignSaveData::Get();
-        static_assert( LAST_SUPPORTED_FORMAT_VERSION < FORMAT_VERSION_0912_RELEASE, "Remove the usage of loadOldSaveSata method." );
-        if ( binver < FORMAT_VERSION_0912_RELEASE ) {
-            Campaign::CampaignSaveData::loadOldSaveSata( fz, saveData );
-        }
-        else {
-            fz >> saveData;
-        }
+        fz >> saveData;
 
         if ( !saveData.isStarting() && saveData.getCurrentScenarioInfoId() == saveData.getLastCompletedScenarioInfoID() ) {
             // This is the end of the current scenario. We should show next scenario selection.

src/fheroes2/kingdom/week.cpp

@@ -293,22 +293,3 @@ Week Week::RandomWeek( const World & worldInstance, const bool isNewMonth, const
 
     return { weekName, Monster::UNKNOWN };
 }
-
-StreamBase & operator>>( StreamBase & stream, Week & week )
-{
-    static_assert( LAST_SUPPORTED_FORMAT_VERSION < FORMAT_VERSION_PRE3_0912_RELEASE, "Remove this operator." );
-
-    int32_t weekType;
-    int32_t monster;
-    StreamBase & sb = stream >> weekType >> monster;
-    week._week = static_cast<WeekName>( weekType );
-    week._monster = static_cast<Monster::monster_t>( monster );
-    return sb;
-}
-
-StreamBase & operator<<( StreamBase & stream, const Week & week )
-{
-    static_assert( LAST_SUPPORTED_FORMAT_VERSION < FORMAT_VERSION_PRE3_0912_RELEASE, "Remove this operator." );
-
-    return stream << static_cast<int32_t>( week.GetType() ) << static_cast<int32_t>( week.GetMonster() );
-}

src/fheroes2/kingdom/week.h

@@ -79,14 +79,9 @@ struct Week
 
     static Week RandomWeek( const World & world, const bool isNewMonth, const uint32_t weekSeed );
 
-    friend StreamBase & operator>>( StreamBase & stream, Week & week );
-
 private:
     WeekName _week;
     Monster::monster_t _monster;
 };
 
-StreamBase & operator>>( StreamBase & stream, Week & week );
-StreamBase & operator<<( StreamBase & stream, const Week & week );
-
 #endif

src/fheroes2/system/save_format_version.h

@@ -24,18 +24,18 @@
 
 enum SaveFileFormat : uint16_t
 {
-    // TODO: if you're adding a new version you must assign it to CURRENT_FORMAT_VERSION located at the bottom.
+    // !!! IMPORTANT !!!
+    // If you're adding a new version you must assign it to CURRENT_FORMAT_VERSION located at the bottom.
+    // If you're removing an old version you must assign the oldest available to LAST_SUPPORTED_FORMAT_VERSION located at the bottom.
     FORMAT_VERSION_0918_RELEASE = 9921,
     FORMAT_VERSION_PRE_0918_RELEASE = 9920,
     FORMAT_VERSION_0917_RELEASE = 9911,
     FORMAT_VERSION_PRE_0917_RELEASE = 9910,
     FORMAT_VERSION_0916_RELEASE = 9901,
     FORMAT_VERSION_PRE_0916_RELEASE = 9900,
     FORMAT_VERSION_0912_RELEASE = 9803,
-    FORMAT_VERSION_PRE3_0912_RELEASE = 9802,
-    FORMAT_VERSION_PRE2_0912_RELEASE = 9801,
 
-    LAST_SUPPORTED_FORMAT_VERSION = FORMAT_VERSION_PRE2_0912_RELEASE,
+    LAST_SUPPORTED_FORMAT_VERSION = FORMAT_VERSION_0912_RELEASE,
 
     CURRENT_FORMAT_VERSION = FORMAT_VERSION_0918_RELEASE
 };

src/fheroes2/world/world.cpp

@@ -1494,16 +1494,7 @@ StreamBase & operator>>( StreamBase & msg, World & w )
     w.height = height;
 
     msg >> w.vec_tiles >> w.vec_heroes >> w.vec_castles >> w.vec_kingdoms >> w._rumors >> w.vec_eventsday >> w.map_captureobj >> w.ultimate_artifact >> w.day >> w.week
-        >> w.month;
-
-    static_assert( LAST_SUPPORTED_FORMAT_VERSION < FORMAT_VERSION_PRE3_0912_RELEASE, "Remove the check below." );
-    if ( Game::GetLoadVersion() < FORMAT_VERSION_PRE3_0912_RELEASE ) {
-        Week dummyWeek;
-
-        msg >> dummyWeek >> dummyWeek;
-    }
-
-    msg >> w.heroes_cond_wins >> w.heroes_cond_loss >> w.map_actions >> w.map_objects >> w._seed;
+        >> w.month >> w.heroes_cond_wins >> w.heroes_cond_loss >> w.map_actions >> w.map_objects >> w._seed;
 
     w.PostLoad( false );