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

Revert back to v2 of house picking/placing patch.

Browse Source
This commit is contained in:
Jonathan G Rennison
2016-05-12 22:35:39 +01:00
parent 6ebea4b49c
commit 95b65163e3
30 changed files with 721 additions and 1401 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/widgets/terraform_widget.h
View File

@@ -39,6 +39,7 @@ enum EditorTerraformToolbarWidgets {
WID_ETT_PLACE_ROCKS, ///< Place rocks button.
WID_ETT_PLACE_DESERT, ///< Place desert button (in tropical climate).
WID_ETT_PLACE_OBJECT, ///< Place transmitter button.
WID_ETT_PLACE_HOUSE, ///< Place house button.
WID_ETT_BUTTONS_END, ///< End of pushable buttons.
WID_ETT_INCREASE_SIZE = WID_ETT_BUTTONS_END, ///< Upwards arrow button to increase terraforming size.
WID_ETT_DECREASE_SIZE, ///< Downwards arrow button to decrease terraforming size.

18
src/widgets/town_widget.h
View File

@@ -62,13 +62,6 @@ enum TownFoundingWidgets {
WID_TF_LAYOUT_RANDOM, ///< Selection for a randomly chosen town layout.
};
/** Widgets of the #SelectTownWindow class. */
enum SelectTownWidgets {
WID_ST_CAPTION, ///< Caption of the window.
WID_ST_PANEL, ///< Main panel.
WID_ST_SCROLLBAR, ///< Scrollbar of the panel.
};
/** Widgets of the #HousePickerWindow class. */
enum HousePickerWidgets {
WID_HP_CAPTION,
@@ -79,10 +72,6 @@ enum HousePickerWidgets {
WID_HP_HOUSE_SELECT_SCROLL, ///< Scrollbar associated with the house matrix.
WID_HP_HOUSE_SELECT, ///< Panels with house images in the house matrix.
WID_HP_HOUSE_PREVIEW, ///< House preview panel.
WID_HP_PREV_VARIANT_SEL, ///< Selection widget to show/hide the prev variant buttons.
WID_HP_PREV_VARIANT, ///< Prev variant button.
WID_HP_NEXT_VARIANT_SEL, ///< Selection widget to show/hide the next variant buttons.
WID_HP_NEXT_VARIANT, ///< Next variant button.
WID_HP_HOUSE_NAME, ///< House name display.
WID_HP_HISTORICAL_BUILDING, ///< "Historical building" label.
WID_HP_HOUSE_POPULATION, ///< House population display.
@@ -94,4 +83,11 @@ enum HousePickerWidgets {
WID_HP_HOUSE_SUPPLY, ///< Cargo supplied.
};
/** Widgets of the #SelectTownWindow class. */
enum SelectTownWidgets {
WID_ST_CAPTION, ///< Caption of the window.
WID_ST_PANEL, ///< Main panel.
WID_ST_SCROLLBAR, ///< Scrollbar of the panel.
};
#endif /* WIDGETS_TOWN_WIDGET_H */