From 0e439aeab7a564c0673464f6a701463a60d46ed5 Mon Sep 17 00:00:00 2001 From: Charles Pigott Date: Sun, 21 Apr 2019 22:39:32 +0100 Subject: Codechange: Remove TownFoundingByte type --- src/settings_type.h | 2 +- src/town_type.h | 6 ++---- 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 : MakeEnumPropsT 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 TownFoundingByte; /** Town cargo generation modes */ enum TownCargoGenMode : byte { -- cgit v1.2.3-70-g09d2