Fix wrong default build order

Author: ottml

libs/s25main/ingameWindows/iwBuildOrder.cpp

@@ -19,10 +19,9 @@
 #include "gameData/BuildingConsts.h"
 #include "gameData/const_gui_ids.h"
 
-void iwBuildOrder::fillBuildOrder()
+void iwBuildOrder::fillBuildOrder(const BuildOrders& build_order)
 {
-    pendingBuildOrder.assign(GAMECLIENT.visual_settings.build_order.begin(),
-                             GAMECLIENT.visual_settings.build_order.end());
+    pendingBuildOrder.assign(build_order.begin(), build_order.end());
 
     auto isUnused = [&](BuildingType const& bld) {
         if(!wineaddon::isAddonActive(gwv.GetWorld()) && wineaddon::isWineAddonBuildingType(bld))
@@ -43,7 +42,7 @@ iwBuildOrder::iwBuildOrder(const GameWorldViewer& gwv)
 {
     ctrlList* list = AddList(0, DrawPoint(15, 60), Extent(150, 220), TextureColor::Grey, NormalFont);
 
-    fillBuildOrder();
+    fillBuildOrder(GAMECLIENT.visual_settings.build_order);
 
     for(const auto buildOrder : pendingBuildOrder)
         list->AddString(_(BUILDING_NAMES[buildOrder])); //-V807
@@ -205,7 +204,7 @@ void iwBuildOrder::Msg_ButtonClick(const unsigned ctrl_id)
         case 10: // Standardwerte
         {
             // Baureihenfolge vom Spieler kopieren
-            fillBuildOrder();
+            fillBuildOrder(GAMECLIENT.default_settings.build_order);
 
             auto* list = GetCtrl<ctrlList>(0);
             list->DeleteAllItems();
@@ -228,7 +227,7 @@ void iwBuildOrder::UpdateSettings()
     if(GAMECLIENT.IsReplayModeOn())
     {
         gwv.GetPlayer().FillVisualSettings(GAMECLIENT.visual_settings);
-        fillBuildOrder();
+        fillBuildOrder(GAMECLIENT.visual_settings.build_order);
         useCustomBuildOrder = GAMECLIENT.visual_settings.useCustomBuildOrder;
     }
     GetCtrl<ctrlComboBox>(6)->SetSelection(useCustomBuildOrder ? 1 : 0);

libs/s25main/ingameWindows/iwBuildOrder.h

@@ -5,6 +5,7 @@
 #pragma once
 
 #include "TransmitSettingsIgwAdapter.h"
+#include "gameTypes/SettingsTypes.h"
 #include <vector>
 
 class GameWorldViewer;
@@ -29,5 +30,5 @@ class iwBuildOrder final : public TransmitSettingsIgwAdapter
     void Msg_ButtonClick(unsigned ctrl_id) override;
     void Msg_ComboSelectItem(unsigned ctrl_id, unsigned selection) override;
 
-    void fillBuildOrder();
+    void fillBuildOrder(const BuildOrders& build_order);
 };