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

Merge branch 'order_occupancy-sx' into jgrpp

Browse Source 
Conflicts:
	src/lang/english.txt
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/settings_gui.cpp
This commit is contained in:
Jonathan G Rennison
2015-08-09 23:45:21 +01:00
parent bd10b0fb0b fdce64ddae
commit f0fecda985
12 changed files with 129 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/widgets/order_widget.h
View File

@@ -39,6 +39,9 @@ enum OrderWidgets {
WID_O_SEL_TOP_ROW, ///< #NWID_SELECTION widget for the top row of the 'your non-trains' order window.
WID_O_SEL_BOTTOM_MIDDLE, ///< #NWID_SELECTION widget for the middle part of the bottom row of the 'your train' order window.
WID_O_SHARED_ORDER_LIST, ///< Open list of shared vehicles.
WID_O_SEL_OCCUPANCY, ///< #NWID_SELECTION widget for the occupancy list panel.
WID_O_OCCUPANCY_LIST, ///< Occupancy list panel.
WID_O_OCCUPANCY_TOGGLE, ///< Toggle display of occupancy measures.
};
#endif /* WIDGETS_ORDER_WIDGET_H */