diff options
Diffstat (limited to 'src/openvic/map/Building.cpp')
| -rw-r--r-- | src/openvic/map/Building.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/openvic/map/Building.cpp b/src/openvic/map/Building.cpp index ccd5ad7..317ccdf 100644 --- a/src/openvic/map/Building.cpp +++ b/src/openvic/map/Building.cpp @@ -2,12 +2,14 @@ #include <cassert> -#include "../Logger.hpp" +#include "../utility/Logger.hpp" #include "Province.hpp" using namespace OpenVic; -Building::Building(BuildingType const& new_type) : HasIdentifier{ new_type.get_identifier() }, type{ new_type } {} +Building::Building(BuildingType const& new_type) + : HasIdentifier { new_type.get_identifier() }, + type { new_type } {} bool Building::_can_expand() const { return level < type.get_max_level(); @@ -74,8 +76,10 @@ void Building::tick(Date const& today) { } } -BuildingType::BuildingType(std::string const& new_identifier, Building::level_t new_max_level, Timespan new_build_time) : - HasIdentifier{ new_identifier }, max_level{ new_max_level }, build_time{ new_build_time } { +BuildingType::BuildingType(std::string const& new_identifier, Building::level_t new_max_level, Timespan new_build_time) + : HasIdentifier { new_identifier }, + max_level { new_max_level }, + build_time { new_build_time } { assert(max_level >= 0); assert(build_time >= 0); } @@ -88,7 +92,7 @@ Timespan BuildingType::get_build_time() const { return build_time; } -BuildingManager::BuildingManager() : building_types{ "building types" } {} +BuildingManager::BuildingManager() : building_types { "building types" } {} return_t BuildingManager::add_building_type(std::string const& identifier, Building::level_t max_level, Timespan build_time) { if (identifier.empty()) { |