Skip to content

Commit

Permalink
Rename function
Browse files Browse the repository at this point in the history
  • Loading branch information
ottml committed Jun 16, 2024
1 parent 7d8bae8 commit 903443d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions libs/s25main/ingameWindows/iwBuildOrder.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand All @@ -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
Expand Down Expand Up @@ -195,7 +195,7 @@ void iwBuildOrder::Msg_ButtonClick(const unsigned ctrl_id)
case 10: // Standardwerte
{
// Baureihenfolge vom Spieler kopieren
fillBuildOrderAndRemoveUnusedBuildings();
fillBuildOrder();

auto* list = GetCtrl<ctrlList>(0);
list->DeleteAllItems();
Expand All @@ -218,7 +218,7 @@ void iwBuildOrder::UpdateSettings()
if(GAMECLIENT.IsReplayModeOn())
{
gwv.GetPlayer().FillVisualSettings(GAMECLIENT.visual_settings);
fillBuildOrderAndRemoveUnusedBuildings();
fillBuildOrder();
useCustomBuildOrder = GAMECLIENT.visual_settings.useCustomBuildOrder;
}
GetCtrl<ctrlComboBox>(6)->SetSelection(useCustomBuildOrder ? 1 : 0);
Expand Down
2 changes: 1 addition & 1 deletion libs/s25main/ingameWindows/iwBuildOrder.h
Original file line number Diff line number Diff line change
Expand Up @@ -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();
};

0 comments on commit 903443d

Please sign in to comment.