mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Codechange: Use std::array for vehicle sorting/grouping options to remove MemSetT.

pull/13829/head
Peter Nelson 2025-03-08 19:41:40 +00:00 committed by Peter Nelson
parent 653e886d26
commit c905472650
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/vehicle_gui.cpp
View File

@ -49,8 +49,8 @@
#include "safeguards.h" #include "safeguards.h"
BaseVehicleListWindow::GroupBy _grouping[VLT_END][VEH_COMPANY_END]; std::array<std::array<BaseVehicleListWindow::GroupBy, VEH_COMPANY_END>, VLT_END> _grouping{};
Sorting _sorting[BaseVehicleListWindow::GB_END]; std::array<Sorting, BaseVehicleListWindow::GB_END> _sorting{};
static BaseVehicleListWindow::VehicleIndividualSortFunction VehicleNumberSorter; static BaseVehicleListWindow::VehicleIndividualSortFunction VehicleNumberSorter;
static BaseVehicleListWindow::VehicleIndividualSortFunction VehicleNameSorter; static BaseVehicleListWindow::VehicleIndividualSortFunction VehicleNameSorter;
@ -1553,8 +1553,8 @@ static bool VehicleTimetableDelaySorter(const Vehicle * const &a, const Vehicle
void InitializeGUI() void InitializeGUI()
{ {
MemSetT(&_grouping, 0); _grouping = {};
MemSetT(&_sorting, 0); _sorting = {};
} }
/** /**

4
src/vehicle_gui_base.h
View File

@ -164,7 +164,7 @@ struct Sorting {
Listing train; Listing train;
}; };
extern BaseVehicleListWindow::GroupBy _grouping[VLT_END][VEH_COMPANY_END]; extern std::array<std::array<BaseVehicleListWindow::GroupBy, VEH_COMPANY_END>, VLT_END> _grouping;
extern Sorting _sorting[BaseVehicleListWindow::GB_END]; extern std::array<Sorting, BaseVehicleListWindow::GB_END> _sorting;
#endif /* VEHICLE_GUI_BASE_H */ #endif /* VEHICLE_GUI_BASE_H */