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

Merge branch 'save_ext' into enhanced_viewport_overlay

Browse Source 
# Conflicts:
#	src/clear_cmd.cpp
This commit is contained in:
Jonathan G Rennison
2016-12-26 15:35:01 +00:00
parent 5d07d4d515 56f173e15e
commit 0d1e08ed75
143 changed files with 2890 additions and 2113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/widgets/autoreplace_widget.h
View File

@@ -35,10 +35,8 @@ enum ReplaceVehicleWidgets {
WID_RV_STOP_REPLACE, ///< Stop Replacing button.
/* Train only widgets. */
WID_RV_TRAIN_ENGINEWAGON_TOGGLE, ///< Button to toggle engines and/or wagons.
WID_RV_TRAIN_FLUFF_LEFT, ///< The fluff on the left.
WID_RV_TRAIN_ENGINEWAGON_DROPDOWN, ///< Dropdown to select engines and/or wagons.
WID_RV_TRAIN_RAILTYPE_DROPDOWN, ///< Dropdown menu about the railtype.
WID_RV_TRAIN_FLUFF_RIGHT, ///< The fluff on the right.
WID_RV_TRAIN_WAGONREMOVE_TOGGLE, ///< Button to toggle removing wagons.
};

3
src/widgets/toolbar_widget.h
View File

@@ -36,7 +36,8 @@ enum ToolbarNormalWidgets {
WID_TN_AIRCRAFTS, ///< Aircraft menu.
WID_TN_ZOOM_IN, ///< Zoom in the main viewport.
WID_TN_ZOOM_OUT, ///< Zoom out the main viewport.
WID_TN_RAILS, ///< Rail building menu.
WID_TN_BUILDING_TOOLS_START, ///< Helper for the offset of the building tools
WID_TN_RAILS = WID_TN_BUILDING_TOOLS_START, ///< Rail building menu.
WID_TN_ROADS, ///< Road building menu.
WID_TN_WATER, ///< Water building toolbar.
WID_TN_AIR, ///< Airport building toolbar.