mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Codechange: Remove TownFoundingByte type

pull/7551/head
Charles Pigott 2019-04-21 22:39:32 +01:00 committed by PeterN
parent 0a57db01af
commit 0e439aeab7
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/settings_type.h
View File

@ -485,7 +485,7 @@ struct EconomySettings {
TownLayoutByte town_layout; ///< select town layout, @see TownLayout TownLayoutByte town_layout; ///< select town layout, @see TownLayout
TownCargoGenMode town_cargogen_mode; ///< algorithm for generating cargo from houses, @see TownCargoGenMode TownCargoGenMode town_cargogen_mode; ///< algorithm for generating cargo from houses, @see TownCargoGenMode
bool allow_town_roads; ///< towns are allowed to build roads (always allowed when generating world / in SE) bool allow_town_roads; ///< towns are allowed to build roads (always allowed when generating world / in SE)
TownFoundingByte found_town; ///< town founding, @see TownFounding TownFounding found_town; ///< town founding.
bool station_noise_level; ///< build new airports when the town noise level is still within accepted limits bool station_noise_level; ///< build new airports when the town noise level is still within accepted limits
uint16 town_noise_population[3]; ///< population to base decision on noise evaluation (@see town_council_tolerance) uint16 town_noise_population[3]; ///< population to base decision on noise evaluation (@see town_council_tolerance)
bool allow_town_level_crossings; ///< towns are allowed to build level crossings bool allow_town_level_crossings; ///< towns are allowed to build level crossings

6
src/town_type.h
View File

@ -94,16 +94,14 @@ template <> struct EnumPropsT<TownLayout> : MakeEnumPropsT<TownLayout, byte, TL_
/** It needs to be 8bits, because we save and load it as such */ /** It needs to be 8bits, because we save and load it as such */
typedef SimpleTinyEnumT<TownLayout, byte> TownLayoutByte; // typedefing-enumification of TownLayout typedef SimpleTinyEnumT<TownLayout, byte> TownLayoutByte; // typedefing-enumification of TownLayout
/** Town founding setting values */ /** Town founding setting values. It needs to be 8bits, because we save and load it as such */
enum TownFounding { enum TownFounding : byte {
TF_BEGIN = 0, ///< Used for iterations and limit testing TF_BEGIN = 0, ///< Used for iterations and limit testing
TF_FORBIDDEN = 0, ///< Forbidden TF_FORBIDDEN = 0, ///< Forbidden
TF_ALLOWED, ///< Allowed TF_ALLOWED, ///< Allowed
TF_CUSTOM_LAYOUT, ///< Allowed, with custom town layout TF_CUSTOM_LAYOUT, ///< Allowed, with custom town layout
TF_END, ///< Used for iterations and limit testing TF_END, ///< Used for iterations and limit testing
}; };
/** It needs to be 8bits, because we save and load it as such */
typedef SimpleTinyEnumT<TownFounding, byte> TownFoundingByte;
/** Town cargo generation modes */ /** Town cargo generation modes */
enum TownCargoGenMode : byte { enum TownCargoGenMode : byte {