From 903443d295655425963fc876cb4c77c8332bd3ae Mon Sep 17 00:00:00 2001 From: Sunrise Date: Sun, 16 Jun 2024 21:11:04 +0200 Subject: [PATCH] Rename function --- libs/s25main/ingameWindows/iwBuildOrder.cpp | 8 ++++---- libs/s25main/ingameWindows/iwBuildOrder.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libs/s25main/ingameWindows/iwBuildOrder.cpp b/libs/s25main/ingameWindows/iwBuildOrder.cpp index 0ff4bb44d..bdc854457 100644 --- a/libs/s25main/ingameWindows/iwBuildOrder.cpp +++ b/libs/s25main/ingameWindows/iwBuildOrder.cpp @@ -18,7 +18,7 @@ #include "gameData/BuildingConsts.h" #include "gameData/const_gui_ids.h" -void iwBuildOrder::fillBuildOrderAndRemoveUnusedBuildings() +void iwBuildOrder::fillBuildOrder() { pendingBuildOrder.assign(GAMECLIENT.visual_settings.build_order.begin(), GAMECLIENT.visual_settings.build_order.end()); @@ -40,7 +40,7 @@ iwBuildOrder::iwBuildOrder(const GameWorldViewer& gwv) { ctrlList* list = AddList(0, DrawPoint(15, 60), Extent(150, 220), TextureColor::Grey, NormalFont); - fillBuildOrderAndRemoveUnusedBuildings(); + fillBuildOrder(); for(const auto buildOrder : pendingBuildOrder) list->AddString(_(BUILDING_NAMES[buildOrder])); //-V807 @@ -195,7 +195,7 @@ void iwBuildOrder::Msg_ButtonClick(const unsigned ctrl_id) case 10: // Standardwerte { // Baureihenfolge vom Spieler kopieren - fillBuildOrderAndRemoveUnusedBuildings(); + fillBuildOrder(); auto* list = GetCtrl(0); list->DeleteAllItems(); @@ -218,7 +218,7 @@ void iwBuildOrder::UpdateSettings() if(GAMECLIENT.IsReplayModeOn()) { gwv.GetPlayer().FillVisualSettings(GAMECLIENT.visual_settings); - fillBuildOrderAndRemoveUnusedBuildings(); + fillBuildOrder(); useCustomBuildOrder = GAMECLIENT.visual_settings.useCustomBuildOrder; } GetCtrl(6)->SetSelection(useCustomBuildOrder ? 1 : 0); diff --git a/libs/s25main/ingameWindows/iwBuildOrder.h b/libs/s25main/ingameWindows/iwBuildOrder.h index 71cd5bb09..1e6fcab13 100644 --- a/libs/s25main/ingameWindows/iwBuildOrder.h +++ b/libs/s25main/ingameWindows/iwBuildOrder.h @@ -29,5 +29,5 @@ class iwBuildOrder final : public TransmitSettingsIgwAdapter void Msg_ButtonClick(unsigned ctrl_id) override; void Msg_ComboSelectItem(unsigned ctrl_id, unsigned selection) override; - void fillBuildOrderAndRemoveUnusedBuildings(); + void fillBuildOrder(); };