dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	src/company_cmd.cpp
#	src/lang/japanese.txt
#	src/network/core/config.h
#	src/network/core/packet.cpp
#	src/network/core/tcp.cpp
#	src/network/network_content.cpp
#	src/network/network_server.cpp
#	src/network/network_udp.cpp
#	src/toolbar_gui.cpp
#	src/vehicle_gui_base.h
This commit is contained in:
Jonathan G Rennison
2021-04-25 22:03:49 +01:00
parent 66fda55ec4 5afb090082
commit 8eb27e1ac7
98 changed files with 1370 additions and 1193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/vehicle_gui_base.h
View File

@@ -86,6 +86,7 @@ public:
byte unitnumber_digits; ///< The number of digits of the highest unit number.
Scrollbar *vscroll;
VehicleListIdentifier vli; ///< Identifier of the vehicle list we want to currently show.
uint order_arrow_width; ///< Width of the arrow in the small order list.
VehicleID vehicle_sel; ///< Selected vehicle
typedef GUIVehicleGroupList::SortFunction VehicleGroupSortFunction;
@@ -130,6 +131,8 @@ public:
BaseVehicleListWindow(WindowDesc *desc, WindowNumber wno);
void OnInit() override;
void UpdateSortingFromGrouping();
void DrawVehicleListItems(VehicleID selected_vehicle, int line_height, const Rect &r) const;
@@ -140,7 +143,6 @@ public:
void SetCargoFilterIndex(int index);
void SetCargoFilterArray();
void FilterVehicleList();
void OnInit() override;
void CheckCargoFilterEnableState(int plane_widget, bool re_init, bool possible = true);
Dimension GetActionDropdownSize(bool show_autoreplace, bool show_group, bool show_template_replace, StringID change_order_str = 0);
DropDownList BuildActionDropdownList(bool show_autoreplace, bool show_group, bool show_template_replace,