Reverted the "performance optimization" changes, added two Asserts, r…

…emoved team determining every frame
Return-To-The-Roots · Dec 4, 2020 · 9d6b2d8 · 9d6b2d8
1 parent e515248
commit 9d6b2d8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/libs/s25main/EconomyModeHandler.cpp b/libs/s25main/EconomyModeHandler.cpp
@@ -125,6 +125,7 @@ void EconomyModeHandler::Serialize(SerializedGameData& sgd) const
 
 void EconomyModeHandler::DetermineTeams()
 {
+    RTTR_Assert(economyModeTeams.empty());
     for(unsigned i = 0; i < gwg->GetNumPlayers(); ++i)
     {
         if(gwg->GetPlayer(i).isUsed())
@@ -200,9 +201,6 @@ void EconomyModeHandler::UpdateAmounts()
         }
     }
 
-    // Compute Teams
-    DetermineTeams();
-
     // Compute the amounts for the teams
     std::fill(maxAmountsATeamCollected.begin(), maxAmountsATeamCollected.end(), 0);
     for(auto& team : economyModeTeams)

diff --git a/libs/s25main/ingameWindows/iwEconomicProgress.cpp b/libs/s25main/ingameWindows/iwEconomicProgress.cpp
@@ -166,6 +166,8 @@ void iwEconomicProgress::Msg_PaintBefore()
     const std::vector<EconomyModeHandler::EconTeam>& economyModeTeams = eH->GetTeams();
     const GamePlayer& mainPlayer = gwv.GetPlayer();
 
+    RTTR_Assert(economyModeTeams.size() == teamOrder.size());
+
     // make sure the amounts are current
     eH->UpdateAmounts();