summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Pigott <charlespigott@googlemail.com>2019-04-21 22:39:32 +0100
committerPeterN <peter@fuzzle.org>2019-04-29 17:40:22 +0100
commit0e439aeab7a564c0673464f6a701463a60d46ed5 (patch)
tree60efa6fab2f04acd5f222595fefd2b8e253e69db
parent0a57db01aff22e9afa368b370d48659854ca4bdd (diff)
downloadopenttd-0e439aeab7a564c0673464f6a701463a60d46ed5.tar.xz
Codechange: Remove TownFoundingByte type
-rw-r--r--src/settings_type.h2
-rw-r--r--src/town_type.h6
2 files changed, 3 insertions, 5 deletions
diff --git a/src/settings_type.h b/src/settings_type.h
index d164be431..054f2a7be 100644
--- a/src/settings_type.h
+++ b/src/settings_type.h
@@ -485,7 +485,7 @@ struct EconomySettings {
TownLayoutByte town_layout; ///< select town layout, @see TownLayout
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)
- 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
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
diff --git a/src/town_type.h b/src/town_type.h
index 608530106..53df4a0e7 100644
--- a/src/town_type.h
+++ b/src/town_type.h
@@ -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 */
typedef SimpleTinyEnumT<TownLayout, byte> TownLayoutByte; // typedefing-enumification of TownLayout
-/** Town founding setting values */
-enum TownFounding {
+/** Town founding setting values. It needs to be 8bits, because we save and load it as such */
+enum TownFounding : byte {
TF_BEGIN = 0, ///< Used for iterations and limit testing
TF_FORBIDDEN = 0, ///< Forbidden
TF_ALLOWED, ///< Allowed
TF_CUSTOM_LAYOUT, ///< Allowed, with custom town layout
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 */
enum TownCargoGenMode : byte {