Fix replay compat for removing invalid fish resources

The 200kGFs replay has been updated to use a savegame.

Author: Flamefire

libs/s25main/Replay.cpp

@@ -40,7 +40,8 @@ uint8_t Replay::GetLatestMinorVersion() const
     // 8.1: Portraits support
     // 8.2: Set correct initial distributions if replay starts without savegame for leather addon (see GameClient.cpp
     //      StartReplay function for detailed description)
-    return 2;
+    // 8.3  Remove invalid fish for replays started from start (i.e. map instead of savegame)
+    return 3;
 }
 
 uint8_t Replay::GetLatestMajorVersion() const

libs/s25main/network/GameClient.cpp

@@ -337,7 +337,9 @@ void GameClient::StartGame(const unsigned random_init)
             OnError(ClientError::InvalidMap);
             return;
         }
-        MapLoader::SetupResources(gameWorld);
+        // TODO (Replay): Always use true
+        const bool fixFish = !GetReplay() || GetReplay()->GetMinorVersion() >= 3;
+        MapLoader::SetupResources(gameWorld, fixFish);
     }
     gameWorld.InitAfterLoad();
 

libs/s25main/world/MapLoader.cpp

@@ -110,7 +110,7 @@ bool MapLoader::PlaceHQs(bool addStartWares)
     return PlaceHQs(world_, hqPositions, addStartWares);
 }
 
-void MapLoader::SetupResources(GameWorldBase& world)
+void MapLoader::SetupResources(GameWorldBase& world, const bool fixFish)
 {
     ResourceType target;
     switch(world.GetGGS().getSelection(AddonId::CHANGE_GOLD_DEPOSITS))
@@ -124,7 +124,8 @@ void MapLoader::SetupResources(GameWorldBase& world)
     }
     ConvertMineResourceTypes(world, ResourceType::Gold, target);
     PlaceAndFixWater(world);
-    RemoveUnusableFishResources(world);
+    if(fixFish)
+        RemoveUnusableFishResources(world);
 }
 
 void MapLoader::ConvertMineResourceTypes(GameWorldBase& world, ResourceType from, ResourceType to)

libs/s25main/world/MapLoader.h

@@ -52,7 +52,8 @@ class MapLoader
     /// Return false if there was an error (e.g. invalid start position)
     bool PlaceHQs(bool addStartWares = true);
     /// Setup resources like gold and water after loading a new map.
-    static void SetupResources(GameWorldBase& world);
+    /// TODO(Replay): Remove fixFish (always set to true)
+    static void SetupResources(GameWorldBase& world, bool fixFish = true);
 
     /// Return the (original/unshuffled) position of the players HQ (only valid after successful load)
     MapPoint GetOriginalHQPos(unsigned player) const { return hqPositions_[player]; }

tests/s25Main/autoplay/main.cpp

@@ -82,7 +82,10 @@ static void playReplay(const boost::filesystem::path& replayPath, const bool isS
         BOOST_TEST_REQUIRE(mapInfo.mapData.DecompressToFile(mapfile.filePath));
         MapLoader loader(gameWorld);
         BOOST_TEST_REQUIRE(loader.Load(mapfile.filePath));
-        MapLoader::SetupResources(gameWorld);
+        // TODO(replay): Since 8.3 invalid fish is removed when starting from map
+        BOOST_TEST_REQUIRE(replay.GetMajorVersion() == 8u);
+        BOOST_TEST_REQUIRE(replay.GetMinorVersion() < 3u);
+        MapLoader::SetupResources(gameWorld, false);
 
         for(unsigned i = 0; i < gameWorld.GetNumPlayers(); ++i)
             gameWorld.GetPlayer(i).MakeStartPacts();