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

Merge branch 'house_placing' into jgrpp

Browse Source
This commit is contained in:
Jonathan G Rennison
2015-08-03 21:29:22 +01:00
parent 675993805b 19dcbb1cb9
commit ce34225b0e
20 changed files with 1495 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -319,6 +319,12 @@ public:
*/
WC_SELECT_STATION = ::WC_SELECT_STATION,
/**
* Select town (when placing a house); %Window numbers:
* - 0 = #SelectTownWidgets
*/
WC_SELECT_TOWN = ::WC_SELECT_TOWN,
/**
* News window; %Window numbers:
* - 0 = #NewsWidgets
@@ -453,6 +459,12 @@ public:
*/
WC_BUILD_OBJECT = ::WC_BUILD_OBJECT,
/**
* Build house; %Window numbers:
* - 0 = #BuildHouseWidgets
*/
WC_BUILD_HOUSE = ::WC_BUILD_HOUSE,
/**
* Build vehicle; %Window numbers:
* - #VehicleType = #BuildVehicleWidgets
@@ -2331,6 +2343,7 @@ public:
WID_ETT_PLACE_ROCKS = ::WID_ETT_PLACE_ROCKS, ///< Place rocks button.
WID_ETT_PLACE_DESERT = ::WID_ETT_PLACE_DESERT, ///< Place desert button (in tropical climate).
WID_ETT_PLACE_OBJECT = ::WID_ETT_PLACE_OBJECT, ///< Place transmitter button.
WID_ETT_PLACE_HOUSE = ::WID_ETT_PLACE_HOUSE, ///< Place house button.
WID_ETT_BUTTONS_END = ::WID_ETT_BUTTONS_END, ///< End of pushable buttons.
WID_ETT_INCREASE_SIZE = ::WID_ETT_INCREASE_SIZE, ///< Upwards arrow button to increase terraforming size.
WID_ETT_DECREASE_SIZE = ::WID_ETT_DECREASE_SIZE, ///< Downwards arrow button to decrease terraforming size.
@@ -2475,6 +2488,34 @@ public:
WID_TF_LAYOUT_RANDOM = ::WID_TF_LAYOUT_RANDOM, ///< Selection for a randomly chosen town layout.
};
/** Widgets of the #HousePickerWindow class. */
enum HousePickerWidgets {
WID_HP_CAPTION = ::WID_HP_CAPTION,
WID_HP_MAIN_PANEL_SEL = ::WID_HP_MAIN_PANEL_SEL, ///< Selection widget to show/hide the main panel.
WID_HP_HOUSE_SETS_SEL = ::WID_HP_HOUSE_SETS_SEL, ///< Selection widget to show/hide the list of house sets.
WID_HP_HOUSE_SETS = ::WID_HP_HOUSE_SETS, ///< List of available house sets.
WID_HP_HOUSE_SELECT_MATRIX = ::WID_HP_HOUSE_SELECT_MATRIX, ///< Matrix with houses to select.
WID_HP_HOUSE_SELECT_SCROLL = ::WID_HP_HOUSE_SELECT_SCROLL, ///< Scrollbar associated with the house matrix.
WID_HP_HOUSE_SELECT = ::WID_HP_HOUSE_SELECT, ///< Panels with house images in the house matrix.
WID_HP_HOUSE_PREVIEW = ::WID_HP_HOUSE_PREVIEW, ///< House preview panel.
WID_HP_HOUSE_NAME = ::WID_HP_HOUSE_NAME, ///< House name display.
WID_HP_HISTORICAL_BUILDING = ::WID_HP_HISTORICAL_BUILDING, ///< "Historical building" label.
WID_HP_HOUSE_POPULATION = ::WID_HP_HOUSE_POPULATION, ///< House population display.
WID_HP_HOUSE_ZONES = ::WID_HP_HOUSE_ZONES, ///< House zones display.
WID_HP_HOUSE_LANDSCAPE = ::WID_HP_HOUSE_LANDSCAPE, ///< Information about house availability against the landscape.
WID_HP_HOUSE_LANDSCAPE_SEL = ::WID_HP_HOUSE_LANDSCAPE_SEL, ///< Selection widget to show/hide the landscape info.
WID_HP_HOUSE_YEARS = ::WID_HP_HOUSE_YEARS, ///< Years display.
WID_HP_HOUSE_ACCEPTANCE = ::WID_HP_HOUSE_ACCEPTANCE, ///< Cargo accepted.
WID_HP_HOUSE_SUPPLY = ::WID_HP_HOUSE_SUPPLY, ///< Cargo supplied.
};
/** Widgets of the #SelectTownWindow class. */
enum SelectTownWidgets {
WID_ST_CAPTION = ::WID_ST_CAPTION, ///< Caption of the window.
WID_ST_PANEL = ::WID_ST_PANEL, ///< Main panel.
WID_ST_SCROLLBAR = ::WID_ST_SCROLLBAR, ///< Scrollbar of the panel.
};
/* automatically generated from ../../widgets/transparency_widget.h */
/** Widgets of the #TransparenciesWindow class. */
enum TransparencyToolbarWidgets {