Merge branch 'house_placing' into jgrpp

2015-08-03 21:29:22 +01:00
parent 675993805b 19dcbb1cb9
commit ce34225b0e
20 changed files with 1495 additions and 264 deletions
--- a/src/window_type.h
+++ b/src/window_type.h
@@ -236,6 +236,12 @@ enum WindowClass {
 	 */
 	WC_SELECT_STATION,

+	/**
+	 * Select town (when placing a house); %Window numbers:
+	 *   - 0 = #SelectTownWidgets
+	 */
+	WC_SELECT_TOWN,
+
 	/**
 	 * News window; %Window numbers:
 	 *   - 0 = #NewsWidgets
@@ -370,6 +376,12 @@ enum WindowClass {
 	 */
 	WC_BUILD_OBJECT,

+	/**
+	 * Build house; %Window numbers:
+	 *  - 0 = #BuildHouseWidgets
+	*/
+	WC_BUILD_HOUSE,
+
 	/**
 	 * Build vehicle; %Window numbers:
 	 *   - #VehicleType = #BuildVehicleWidgets