equal
deleted
inserted
replaced
195 * So user can at least buld that airport |
195 * So user can at least buld that airport |
196 * @return the maximum noise level the town will tolerate */ |
196 * @return the maximum noise level the town will tolerate */ |
197 inline uint16 MaxTownNoise() const { |
197 inline uint16 MaxTownNoise() const { |
198 if (this->population == 0) return 0; // no population? no noise |
198 if (this->population == 0) return 0; // no population? no noise |
199 |
199 |
200 return ((this->population / _settings.economy.town_noise_population[_settings.difficulty.town_council_tolerance]) + 3); |
200 return ((this->population / _settings_game.economy.town_noise_population[_settings_game.difficulty.town_council_tolerance]) + 3); |
201 } |
201 } |
202 }; |
202 }; |
203 |
203 |
204 /** |
204 /** |
205 * Get the current valid layout for the town |
205 * Get the current valid layout for the town |
206 * @return the active layout for this town |
206 * @return the active layout for this town |
207 */ |
207 */ |
208 inline TownLayout Town::GetActiveLayout() const |
208 inline TownLayout Town::GetActiveLayout() const |
209 { |
209 { |
210 return (_settings.economy.town_layout == TL_RANDOM) ? this->layout : _settings.economy.town_layout; |
210 return (_settings_game.economy.town_layout == TL_RANDOM) ? this->layout : _settings_game.economy.town_layout; |
211 } |
211 } |
212 |
212 |
213 struct HouseSpec { |
213 struct HouseSpec { |
214 /* Standard properties */ |
214 /* Standard properties */ |
215 Year min_date; ///< introduction year of the house |
215 Year min_date; ///< introduction year of the house |