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/fileio.cpp
#	src/group_gui.cpp
#	src/industry.h
#	src/lang/korean.txt
#	src/linkgraph/linkgraphjob.cpp
#	src/linkgraph/linkgraphjob.h
#	src/linkgraph/linkgraphschedule.cpp
#	src/linkgraph/linkgraphschedule.h
#	src/openttd.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/town_cmd.cpp
#	src/vehicle_gui.cpp
#	src/vehicle_gui_base.h
This commit is contained in:
Jonathan G Rennison
2021-01-30 18:27:25 +00:00
parent 7cf4621b1c 79cb9efa7f
commit 39df1c49a1
102 changed files with 1870 additions and 1765 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/widgets/group_widget.h
View File

@@ -14,6 +14,8 @@
enum GroupListWidgets {
WID_GL_LIST_VEHICLE, ///< List of the vehicles, this must be first, see: DirtyVehicleListWindowForVehicle
WID_GL_CAPTION, ///< Caption of the window.
WID_GL_GROUP_BY_ORDER, ///< Group order.
WID_GL_GROUP_BY_DROPDOWN, ///< Group by dropdown list.
WID_GL_SORT_BY_ORDER, ///< Sort order.
WID_GL_SORT_BY_DROPDOWN, ///< Sort by dropdown list.
WID_GL_FILTER_BY_CARGO, ///< Filter vehicle by cargo type.

5
src/widgets/network_widget.h
View File

@@ -14,8 +14,6 @@
enum NetworkGameWidgets {
WID_NG_MAIN, ///< Main panel.
WID_NG_CONNECTION, ///< Label in front of connection droplist.
WID_NG_CONN_BTN, ///< 'Connection' droplist button.
WID_NG_CLIENT_LABEL, ///< Label in front of client name edit box.
WID_NG_CLIENT, ///< Panel with editbox to set client name.
WID_NG_FILTER_LABEL, ///< Label in front of the filter/search edit box.
@@ -45,7 +43,8 @@ enum NetworkGameWidgets {
WID_NG_NEWGRF_MISSING, ///< 'Find missing NewGRF online' button.
WID_NG_NEWGRF_MISSING_SEL, ///< Selection widget for the above button.
WID_NG_FIND, ///< 'Find server' button.
WID_NG_SEARCH_INTERNET, ///< 'Search internet server' button.
WID_NG_SEARCH_LAN, ///< 'Search LAN server' button.
WID_NG_ADD, ///< 'Add server' button.
WID_NG_START, ///< 'Start server' button.
WID_NG_CANCEL, ///< 'Cancel' button.

4
src/widgets/station_widget.h
View File

@@ -13,10 +13,10 @@
/** Widgets of the #StationViewWindow class. */
enum StationViewWidgets {
WID_SV_CAPTION, ///< Caption of the window.
WID_SV_SORT_ORDER, ///< 'Sort order' button
WID_SV_SORT_BY, ///< 'Sort by' button
WID_SV_GROUP, ///< label for "group by"
WID_SV_GROUP_BY, ///< 'Group by' button
WID_SV_SORT_ORDER, ///< 'Sort order' button
WID_SV_SORT_BY, ///< 'Sort by' button
WID_SV_WAITING, ///< List of waiting cargo.
WID_SV_SCROLLBAR, ///< Scrollbar.
WID_SV_ACCEPT_RATING_LIST, ///< List of accepted cargoes / rating of cargoes.

2
src/widgets/vehicle_widget.h
View File

@@ -62,6 +62,8 @@ enum VehicleDetailsWidgets {
enum VehicleListWidgets {
WID_VL_LIST, ///< List of the vehicles, this must be first, see: DirtyVehicleListWindowForVehicle
WID_VL_CAPTION, ///< Caption of window.
WID_VL_GROUP_ORDER, ///< Group order.
WID_VL_GROUP_BY_PULLDOWN, ///< Group by dropdown list.
WID_VL_SORT_ORDER, ///< Sort order.
WID_VL_SORT_BY_PULLDOWN, ///< Sort by dropdown list.
WID_VL_FILTER_BY_CARGO, ///< Cargo filter dropdown list