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

Merge branch 'cargo_type_order' into jgrpp

Browse Source 
# Conflicts:
#	src/order_base.h
#	src/order_gui.cpp
#	src/order_type.h
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/extended_ver_sl.h
#	src/vehicle_base.h
This commit is contained in:
Jonathan G Rennison
2016-09-08 00:12:48 +01:00
parent 153a0536df bc04b07f2b
commit 9ea018abc5
19 changed files with 1079 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/script/api/script_window.hpp
View File

@@ -289,6 +289,18 @@ public:
*/
WC_VEHICLE_ORDERS = ::WC_VEHICLE_ORDERS,
/**
* Vehicle cargo type load orders; %Window numbers:
* - #VehicleID = #CargoTypeOrdersWidgets
*/
WC_VEHICLE_CARGO_TYPE_LOAD_ORDERS = ::WC_VEHICLE_CARGO_TYPE_LOAD_ORDERS,
/**
* Vehicle cargo type unload orders; %Window numbers:
* - #VehicleID = #CargoTypeOrdersWidgets
*/
WC_VEHICLE_CARGO_TYPE_UNLOAD_ORDERS = ::WC_VEHICLE_CARGO_TYPE_UNLOAD_ORDERS,
/**
* Replace vehicle window; %Window numbers:
* - #VehicleType = #ReplaceVehicleWidgets
@@ -1957,6 +1969,21 @@ public:
WID_O_SHARED_ORDER_LIST = ::WID_O_SHARED_ORDER_LIST, ///< Open list of shared vehicles.
};
/** Widgets of the #CargoTypeOrdersWindow class. */
enum CargoTypeOrdersWidgets {
WID_CTO_CAPTION = ::WID_CTO_CAPTION, ///< Caption of the window.
WID_CTO_HEADER = ::WID_CTO_HEADER, ///< Window header.
WID_CTO_CLOSEBTN = ::WID_CTO_CLOSEBTN, ///< Close button.
WID_CTO_SET_TO_ALL_LABEL = ::WID_CTO_SET_TO_ALL_LABEL, ///< 'Set to all' dropdown label
WID_CTO_SET_TO_ALL_DROPDOWN = ::WID_CTO_SET_TO_ALL_DROPDOWN, ///< 'Set to all' dropdown
WID_CTO_CARGO_ROW_FIRST = ::WID_CTO_CARGO_ROW_FIRST, ///< First cargo type order row.
WID_CTO_CARGO_ROW_LAST = ::WID_CTO_CARGO_ROW_LAST, ///< Last cargo type order row.
WID_CTO_CARGO_LABEL_FIRST = ::WID_CTO_CARGO_LABEL_FIRST, ///< First cargo label.
WID_CTO_CARGO_LABEL_LAST = ::WID_CTO_CARGO_LABEL_LAST, ///< Last cargo label.
WID_CTO_CARGO_DROPDOWN_FIRST = ::WID_CTO_CARGO_DROPDOWN_FIRST, ///< First order dropdown.
WID_CTO_CARGO_DROPDOWN_LAST = ::WID_CTO_CARGO_DROPDOWN_LAST, ///< Last order dropdown.
};
/* automatically generated from ../../widgets/osk_widget.h */
/** Widgets of the #OskWindow class. */
enum OnScreenKeyboardWidgets {