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

Merge tag '1.11.0-beta1' into jgrpp

Browse Source 
# Conflicts:
#	src/console_cmds.cpp
#	src/gfx_func.h
#	src/industry.h
#	src/lang/czech.txt
#	src/lang/estonian.txt
#	src/lang/german.txt
#	src/lang/indonesian.txt
#	src/lang/japanese.txt
#	src/lang/norwegian_bokmal.txt
#	src/lang/russian.txt
#	src/lang/slovak.txt
#	src/saveload/saveload.h
#	src/station_gui.cpp
#	src/town_gui.cpp
#	src/vehicle_gui.cpp
#	src/video/sdl2_v.cpp
#	src/waypoint_gui.cpp
This commit is contained in:
Jonathan G Rennison
2021-02-01 18:58:36 +00:00
parent 61e7b8c52a a252679a12
commit 7154f8859d
130 changed files with 1579 additions and 1104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/widgets/misc_widget.h
View File

@@ -12,6 +12,7 @@
/** Widgets of the #LandInfoWindow class. */
enum LandInfoWidgets {
WID_LI_LOCATION, ///< Scroll to location.
WID_LI_BACKGROUND, ///< Background of the window.
};

1
src/widgets/sign_widget.h
View File

@@ -24,6 +24,7 @@ enum SignListWidgets {
/** Widgets of the #SignWindow class. */
enum QueryEditSignWidgets {
WID_QES_CAPTION, ///< Caption of the window.
WID_QES_LOCATION, ///< Scroll to sign location.
WID_QES_TEXT, ///< Text of the query.
WID_QES_OK, ///< OK button.
WID_QES_CANCEL, ///< Cancel button.

5
src/widgets/vehicle_widget.h
View File

@@ -15,7 +15,9 @@ enum VehicleViewWidgets {
WID_VV_CAPTION, ///< Caption of window.
WID_VV_VIEWPORT, ///< Viewport widget.
WID_VV_START_STOP, ///< Start or stop this vehicle, and show information about the current state.
WID_VV_CENTER_MAIN_VIEW, ///< Center the main view on this vehicle.
WID_VV_RENAME, ///< Rename vehicle
WID_VV_LOCATION, ///< Center the main view on this vehicle.
WID_VV_ORDER_LOCATION, ///< Center the main view on the order's target location.
WID_VV_GOTO_DEPOT, ///< Order this vehicle to go to the depot.
WID_VV_REFIT, ///< Open the refit window.
WID_VV_SHOW_ORDERS, ///< Show the orders of this vehicle.
@@ -43,7 +45,6 @@ enum VehicleRefitWidgets {
/** Widgets of the #VehicleDetailsWindow class. */
enum VehicleDetailsWidgets {
WID_VD_CAPTION, ///< Caption of window.
WID_VD_RENAME_VEHICLE, ///< Rename this vehicle.
WID_VD_TOP_DETAILS, ///< Panel with generic details.
WID_VD_INCREASE_SERVICING_INTERVAL, ///< Increase the servicing interval.
WID_VD_DECREASE_SERVICING_INTERVAL, ///< Decrease the servicing interval.