Merge branch 'master' into jgrpp

# Conflicts:
#	docs/landscape_grid.html
This commit is contained in:
Jonathan G Rennison
2018-08-06 02:33:13 +01:00
11 changed files with 121 additions and 2 deletions

View File

@@ -120,7 +120,7 @@ struct HouseSpec {
AnimationInfo animation; ///< information about the animation.
byte processing_time; ///< Periodic refresh multiplier
byte minimum_life; ///< The minimum number of years this house will survive before the town rebuilds it
uint32 watched_cargoes; ///< Cargo types watched for acceptance.
CargoTypes watched_cargoes; ///< Cargo types watched for acceptance.
Money GetRemovalCost() const;