Import cargo type orders patch

https://www.tt-forums.net/viewtopic.php?p=1047749#p1047749

Port to current trunk, resolve various conflicts, etc.
Adjust bit allocations for CmdModifyOrder.
Use save_ext framework for added order flags.
This commit is contained in:
Jonathan G Rennison
2016-09-03 22:18:01 +01:00
parent 8deac54c9f
commit c1c983ea16
12 changed files with 661 additions and 44 deletions

View File

@@ -12,6 +12,8 @@
#ifndef WIDGETS_ORDER_WIDGET_H
#define WIDGETS_ORDER_WIDGET_H
#include "../cargo_type.h"
/** Widgets of the #OrdersWindow class. */
enum OrderWidgets {
WID_O_CAPTION, ///< Caption of the window.
@@ -41,4 +43,19 @@ enum OrderWidgets {
WID_O_SHARED_ORDER_LIST, ///< Open list of shared vehicles.
};
/** Widgets of the #CargoTypeOrdersWindow class. */
enum CargoTypeOrdersWidgets {
WID_CTO_CAPTION, ///< Caption of the window.
WID_CTO_HEADER, ///< Window header.
WID_CTO_CLOSEBTN, ///< Close button.
WID_CTO_SET_TO_ALL_LABEL, ///< 'Set to all' dropdown label
WID_CTO_SET_TO_ALL_DROPDOWN, ///< 'Set to all' dropdown
WID_CTO_CARGO_ROW_FIRST, ///< First cargo type order row.
WID_CTO_CARGO_ROW_LAST = WID_CTO_CARGO_ROW_FIRST + NUM_CARGO - 1, ///< Last cargo type order row.
WID_CTO_CARGO_LABEL_FIRST, ///< First cargo label.
WID_CTO_CARGO_LABEL_LAST = WID_CTO_CARGO_LABEL_FIRST + NUM_CARGO - 1, ///< Last cargo label.
WID_CTO_CARGO_DROPDOWN_FIRST, ///< First order dropdown.
WID_CTO_CARGO_DROPDOWN_LAST = WID_CTO_CARGO_DROPDOWN_FIRST + NUM_CARGO - 1, ///< Last order dropdown.
};
#endif /* WIDGETS_ORDER_WIDGET_H */