Merge pull request #1961 from tost11/feature/fix-emergency-protocol

fixed emergency protocol by removing sheduled wares requested before ...

Author: Flamefire

external/libutil

@@ -157,8 +157,8 @@ void HeadlessGame::RecordReplay(const bfs::path& path, unsigned random_init)
         mapInfo.luaData.CompressFromFile(luaPath_, &mapInfo.luaChecksum);
     }
 
-    for(unsigned playerId = 0; playerId < world_.GetNumPlayers(); ++playerId)
-        replay_.AddPlayer(world_.GetPlayer(playerId));
+    for(auto& player : world_.getPlayers())
+        replay_.AddPlayer(player);
     replay_.ggs = game_.ggs_;
     if(!replay_.StartRecording(path, mapInfo, random_init))
         throw std::runtime_error("Replayfile could not be opened!");
@@ -170,8 +170,8 @@ void HeadlessGame::SaveGame(const bfs::path& path) const
     bfs::remove(path);
 
     Savegame save;
-    for(unsigned playerId = 0; playerId < world_.GetNumPlayers(); ++playerId)
-        save.AddPlayer(world_.GetPlayer(playerId));
+    for(auto& player : world_.getPlayers())
+        save.AddPlayer(player);
     save.ggs = game_.ggs_;
     save.ggs.exploration = Exploration::Disabled; // no FOW
     save.start_gf = em_.GetCurrentGF();
@@ -220,9 +220,8 @@ void HeadlessGame::PrintState()
     printConsole("┌────────────────────────┬─────────────────┬─────────────┬───────────┬───────────┐\n");
     printConsole("│ Player                 │ Country         │ Buildings   │ Military  │ Gold      │\n");
     printConsole("├────────────────────────┼─────────────────┼─────────────┼───────────┼───────────┤\n");
-    for(unsigned playerId = 0; playerId < world_.GetNumPlayers(); ++playerId)
+    for(const auto& player : world_.getPlayers())
     {
-        const GamePlayer& player = world_.GetPlayer(playerId);
         printConsole("│ %s%-22s%s │ %15s │ %11s │ %9s │ %9s │\n", player.IsDefeated() ? "\x1b[9m" : "",
                      player.name.c_str(), player.IsDefeated() ? "\x1b[29m" : "",
                      HumanReadableNumber(player.GetStatisticCurrentValue(StatisticType::Country)).c_str(),

extras/ai-battle/HeadlessGame.cpp

@@ -61,9 +61,9 @@ namespace {
 unsigned getNumAlivePlayers(const GameWorldBase& world)
 {
     unsigned numPlayersAlive = 0;
-    for(unsigned i = 0; i < world.GetNumPlayers(); ++i)
+    for(const auto& player : world.getPlayers())
     {
-        if(!world.GetPlayer(i).IsDefeated())
+        if(!player.IsDefeated())
             ++numPlayersAlive;
     }
     return numPlayersAlive;
@@ -76,9 +76,8 @@ void Game::RunGF()
     //  EventManager Bescheid sagen
     em_->ExecuteNextGF();
     // Notfallprogramm durchlaufen lassen
-    for(unsigned i = 0; i < world_.GetNumPlayers(); ++i)
+    for(GamePlayer& player : world_.getPlayers())
     {
-        GamePlayer& player = world_.GetPlayer(i);
         if(player.isUsed())
         {
             // Auf Notfall testen (Wenige Bretter/Steine und keine Holzindustrie)
@@ -100,8 +99,8 @@ void Game::RunGF()
 
 void Game::StatisticStep()
 {
-    for(unsigned i = 0; i < world_.GetNumPlayers(); ++i)
-        world_.GetPlayer(i).StatisticStep();
+    for(auto& player : world_.getPlayers())
+        player.StatisticStep();
 
     CheckObjective();
 }

libs/s25main/Game.cpp

@@ -889,6 +889,12 @@ void GamePlayer::FindWarehouseForAllJobs(const Job job)
     }
 }
 
+static bool IsWareFineWithEmergencyProtocol(GoodType goodType, const noBaseBuilding& goal)
+{
+    return (goodType != GoodType::Boards && goodType != GoodType::Stones)
+           || goal.GetBuildingType() == BuildingType::Woodcutter || goal.GetBuildingType() == BuildingType::Sawmill;
+}
+
 Ware* GamePlayer::OrderWare(const GoodType ware, noBaseBuilding& goal)
 {
     /// Gibt es ein Lagerhaus mit dieser Ware?
@@ -902,8 +908,7 @@ Ware* GamePlayer::OrderWare(const GoodType ware, noBaseBuilding& goal)
         else
         {
             // Wenn Notfallprogramm aktiv nur an Holzfäller und Sägewerke Bretter/Steine liefern
-            if((ware != GoodType::Boards && ware != GoodType::Stones)
-               || goal.GetBuildingType() == BuildingType::Woodcutter || goal.GetBuildingType() == BuildingType::Sawmill)
+            if(IsWareFineWithEmergencyProtocol(ware, goal))
                 return wh->OrderWare(ware, goal);
             else
                 return nullptr;
@@ -2089,6 +2094,23 @@ bool GamePlayer::FindHarborForUnloading(noShip* ship, const MapPoint start, Harb
     return false;
 }
 
+void GamePlayer::CancelWaresForEmergencyProtocol()
+{
+    for(auto it = ware_list.begin(); it != ware_list.end();)
+    {
+        Ware* ware = *it;
+        if(ware->IsWaitingInWarehouse() && ware->GetGoal()
+           && !IsWareFineWithEmergencyProtocol(ware->type, *ware->GetGoal()))
+        {
+            ware->NotifyGoalAboutLostWare();
+            static_cast<nobBaseWarehouse*>(ware->GetLocation())->CancelWare(ware);
+            it = ware_list.erase(it);
+            continue;
+        }
+        it++;
+    }
+}
+
 void GamePlayer::TestForEmergencyProgramm()
 {
     // we are already defeated, do not even think about an emergency program - it's too late :-(
@@ -2118,6 +2140,9 @@ void GamePlayer::TestForEmergencyProgramm()
             emergency = true;
             SendPostMessage(std::make_unique<PostMsg>(
               world.GetEvMgr().GetCurrentGF(), _("The emergency program has been activated."), PostCategory::Economy));
+
+            // Handle wares already ordered
+            CancelWaresForEmergencyProtocol();
         }
     } else
     {

libs/s25main/GamePlayer.cpp

@@ -331,6 +331,8 @@ class GamePlayer : public GamePlayerInfo
     const Statistic& GetStatistic(StatisticTime time) const { return statistic[time]; };
     unsigned GetStatisticCurrentValue(StatisticType idx) const { return statisticCurrentData[idx]; }
 
+    // Stop wares restricted in emergency mode that are waiting in warehouse to be transported already
+    void CancelWaresForEmergencyProtocol();
     // Testet ob Notfallprogramm aktiviert werden muss und tut dies dann
     void TestForEmergencyProgramm();
     bool hasEmergency() const { return emergency; }

libs/s25main/GamePlayer.h

@@ -258,13 +258,13 @@ void SerializedGameData::MakeSnapshot(const Game& game)
         PushObject(gw.getEconHandler(), true);
     }
     // Spieler serialisieren
-    for(unsigned i = 0; i < gw.GetNumPlayers(); ++i)
+    for(const auto& player : gw.getPlayers())
     {
         if(debugMode)
-            LOG.write("Start serializing player %1% at %2%\n") % i % GetLength();
-        gw.GetPlayer(i).Serialize(*this);
+            LOG.write("Start serializing player %1% at %2%\n") % player.GetPlayerId() % GetLength();
+        player.Serialize(*this);
         if(debugMode)
-            LOG.write("Done serializing player %1% at %2%\n") % i % GetLength();
+            LOG.write("Done serializing player %1% at %2%\n") % player.GetPlayerId() % GetLength();
     }
 
     if(writtenEventIds.size() != writeEm->GetNumActiveEvents())
@@ -301,8 +301,8 @@ void SerializedGameData::ReadSnapshot(Game& game, ILocalGameState& localGameStat
           std::unique_ptr<EconomyModeHandler>(PopObject<EconomyModeHandler>(GO_Type::Economymodehandler)));
     }
 
-    for(unsigned i = 0; i < gw.GetNumPlayers(); ++i)
-        gw.GetPlayer(i).Deserialize(*this);
+    for(auto& player : gw.getPlayers())
+        player.Deserialize(*this);
 
     // If this check fails, we did not serialize all objects or there was an async
     if(readEvents.size() != em->GetNumActiveEvents())

libs/s25main/SerializedGameData.cpp

@@ -82,9 +82,9 @@ iwStatistics::iwStatistics(const GameWorldViewer& gwv)
     // Count active players
     numPlayingPlayers = 0;
     const GameWorldBase& world = gwv.GetWorld();
-    for(const auto i : helpers::range(world.GetNumPlayers()))
+    for(const auto& player : world.getPlayers())
     {
-        if(world.GetPlayer(i).isUsed())
+        if(player.isUsed())
             numPlayingPlayers++;
     }
 

libs/s25main/ingameWindows/iwStatistics.cpp

@@ -327,8 +327,8 @@ void GameClient::StartGame(const unsigned random_init)
     {
         RTTR_Assert(mapinfo.type != MapType::Savegame);
         /// Startbündnisse setzen
-        for(unsigned i = 0; i < gameWorld.GetNumPlayers(); ++i)
-            gameWorld.GetPlayer(i).MakeStartPacts();
+        for(auto& player : gameWorld.getPlayers())
+            player.MakeStartPacts();
 
         MapLoader loader(gameWorld);
         if(!loader.Load(mapinfo.filepath)
@@ -1580,8 +1580,8 @@ bool GameClient::StartReplay(const boost::filesystem::path& path)
             idx++;
         }
 
-        for(unsigned i = 0; i < game->world_.GetNumPlayers(); i++)
-            game->world_.GetPlayer(i).ChangeDistribution(newDistributions);
+        for(auto& player : game->world_.getPlayers())
+            player.ChangeDistribution(newDistributions);
     }
 
     replayinfo->next_gf = replayinfo->replay.ReadGF();

libs/s25main/network/GameClient.cpp

@@ -66,6 +66,16 @@ unsigned GameWorldBase::GetNumPlayers() const
     return players.size();
 }
 
+s25util::span<GamePlayer> GameWorldBase::getPlayers()
+{
+    return players;
+}
+
+s25util::span<const GamePlayer> GameWorldBase::getPlayers() const
+{
+    return players;
+}
+
 bool GameWorldBase::IsSinglePlayer() const
 {
     bool foundPlayer = false;

libs/s25main/world/GameWorldBase.cpp

@@ -1,4 +1,4 @@
-// Copyright (C) 2005 - 2021 Settlers Freaks (sf-team at siedler25.org)
+// Copyright (C) 2005 - 2026 Settlers Freaks (sf-team at siedler25.org)
 //
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -12,6 +12,7 @@
 #include "notifications/NotificationManager.h"
 #include "postSystem/PostManager.h"
 #include "world/World.h"
+#include "s25util/span.hpp"
 #include <memory>
 #include <set>
 #include <vector>
@@ -158,6 +159,8 @@ class GameWorldBase : public World
     GamePlayer& GetPlayer(unsigned id);
     const GamePlayer& GetPlayer(unsigned id) const;
     unsigned GetNumPlayers() const;
+    s25util::span<GamePlayer> getPlayers();
+    s25util::span<const GamePlayer> getPlayers() const;
     bool IsSinglePlayer() const;
     /// Return the game settings
     const GlobalGameSettings& GetGGS() const { return gameSettings; }