Merge branch 'house_placing' into jgrpp

This commit is contained in:
Jonathan G Rennison
2015-08-03 21:29:22 +01:00
20 changed files with 1495 additions and 264 deletions

View File

@@ -40,6 +40,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.