Astyle formatting (with manual cleanup)

1 files changed, 32 insertions, 25 deletions

diff --git a/src/openvic-simulation/economy/Building.cpp b/src/openvic-simulation/economy/Building.cpp
index 4a99249..29eb50e 100644
--- a/src/openvic-simulation/economy/Building.cpp
+++ b/src/openvic-simulation/economy/Building.cpp
@@ -7,13 +7,13 @@ using namespace OpenVic::NodeTools;
 
 Building::Building(std::string_view identifier, BuildingType const& type, ARGS)
 	: HasIdentifier { identifier }, type { type }, modifier { std::move(modifier) }, on_completion { on_completion },
-	completion_size { completion_size }, max_level { max_level }, goods_cost { std::move(goods_cost) }, cost { cost },
-	build_time { build_time }, visibility { visibility }, on_map { on_map }, default_enabled { default_enabled },
-	production_type { production_type }, pop_build_factory { pop_build_factory }, strategic_factory { strategic_factory },
-	advanced_factory { advanced_factory }, fort_level { fort_level }, naval_capacity { naval_capacity },
-	colonial_points { std::move(colonial_points) }, in_province { in_province }, one_per_state { one_per_state },
-	colonial_range { colonial_range }, infrastructure { infrastructure }, spawn_railway_track { spawn_railway_track },
-	sail { sail }, steam { steam }, capital { capital }, port { port } {}
+	  completion_size { completion_size }, max_level { max_level }, goods_cost { std::move(goods_cost) }, cost { cost },
+	  build_time { build_time }, visibility { visibility }, on_map { on_map }, default_enabled { default_enabled },
+	  production_type { production_type }, pop_build_factory { pop_build_factory }, strategic_factory { strategic_factory },
+	  advanced_factory { advanced_factory }, fort_level { fort_level }, naval_capacity { naval_capacity },
+	  colonial_points { std::move(colonial_points) }, in_province { in_province }, one_per_state { one_per_state },
+	  colonial_range { colonial_range }, infrastructure { infrastructure }, spawn_railway_track { spawn_railway_track },
+	  sail { sail }, steam { steam }, capital { capital }, port { port } {}
 
 BuildingType const& Building::get_type() const {
 	return type;
@@ -154,14 +154,15 @@ bool BuildingInstance::expand() {
  */
 void BuildingInstance::update_state(Date const& today) {
 	switch (expansion_state) {
-		case ExpansionState::Preparing:
-			start = today;
-			end = start + building.get_build_time();
-			break;
-		case ExpansionState::Expanding:
-			expansion_progress = static_cast<double>(today - start) / static_cast<double>(end - start);
-			break;
-		default: expansion_state = _can_expand() ? ExpansionState::CanExpand : ExpansionState::CannotExpand;
+	case ExpansionState::Preparing:
+		start = today;
+		end = start + building.get_build_time();
+		break;
+	case ExpansionState::Expanding:
+		expansion_progress = static_cast<double>(today - start) / static_cast<double>(end - start);
+		break;
+	default:
+		expansion_state = _can_expand() ? ExpansionState::CanExpand : ExpansionState::CannotExpand;
 	}
 }
 
@@ -198,13 +199,16 @@ bool BuildingManager::add_building(std::string_view identifier, BuildingType con
 	}
 
 	return buildings.add_item({
-		identifier, *type, std::move(modifier), on_completion, completion_size, max_level, std::move(goods_cost), cost, build_time, visibility, on_map, default_enabled,
-		production_type, pop_build_factory, strategic_factory, advanced_factory, fort_level, naval_capacity, std::move(colonial_points), in_province, one_per_state,
+		identifier, *type, std::move(modifier), on_completion, completion_size, max_level, std::move(goods_cost),
+		cost, build_time, visibility, on_map, default_enabled, production_type, pop_build_factory, strategic_factory,
+		advanced_factory, fort_level, naval_capacity, std::move(colonial_points), in_province, one_per_state,
 		colonial_range, infrastructure, spawn_railway_track, sail, steam, capital, port
 	});
 }
 
-bool BuildingManager::load_buildings_file(GoodManager const& good_manager, ProductionTypeManager const& production_type_manager, ModifierManager const& modifier_manager, ast::NodeCPtr root) {
+bool BuildingManager::load_buildings_file(GoodManager const& good_manager,
+	ProductionTypeManager const& production_type_manager,
+	ModifierManager const& modifier_manager, ast::NodeCPtr root) {
 	bool ret = expect_dictionary_reserve_length(buildings, [this](std::string_view, ast::NodeCPtr value) -> bool {
 		return expect_key("type", expect_identifier(
 			std::bind(&BuildingManager::add_building_type, this, std::placeholders::_1)
@@ -212,7 +216,8 @@ bool BuildingManager::load_buildings_file(GoodManager const& good_manager, Produ
 	})(root);
 	lock_building_types();
 
-	ret &= expect_dictionary([this, &good_manager, &production_type_manager, &modifier_manager](std::string_view key, ast::NodeCPtr value) -> bool {
+	ret &= expect_dictionary([this, &good_manager, &production_type_manager, &modifier_manager](
+		std::string_view key, ast::NodeCPtr value) -> bool {
 		BuildingType const* type = nullptr;
 		ProductionType const* production_type = nullptr;
 		std::string_view on_completion;
@@ -220,8 +225,10 @@ bool BuildingManager::load_buildings_file(GoodManager const& good_manager, Produ
 		Building::level_t max_level = 0, fort_level = 0;
 		Good::good_map_t goods_cost;
 		Timespan build_time;
-		bool visibility = false, on_map = false, default_enabled = false, pop_build_factory = false, strategic_factory = false, advanced_factory = false;
-		bool in_province = false, one_per_state = false, spawn_railway_track = false, sail = false, steam = false, capital = false, port = false;
+		bool visibility = false, on_map = false, default_enabled = false, pop_build_factory = false;
+		bool strategic_factory = false, advanced_factory = false;
+		bool in_province = false, one_per_state = false, spawn_railway_track = false, sail = false, steam = false;
+		bool capital = false, port = false;
 		uint64_t naval_capacity = 0;
 		std::vector<fixed_point_t> colonial_points;
 		ModifierValue modifier;
@@ -260,10 +267,10 @@ bool BuildingManager::load_buildings_file(GoodManager const& good_manager, Produ
 		)(value);
 
 		ret &= add_building(
-			key, type,std::move(modifier), on_completion, completion_size, max_level, std::move(goods_cost), cost, build_time,
-			visibility, on_map, default_enabled, production_type, pop_build_factory, strategic_factory, advanced_factory,
-			fort_level, naval_capacity, std::move(colonial_points), in_province, one_per_state, colonial_range, infrastructure,
-			spawn_railway_track, sail, steam, capital, port
+			key, type, std::move(modifier), on_completion, completion_size, max_level, std::move(goods_cost),
+			cost, build_time, visibility, on_map, default_enabled, production_type, pop_build_factory, strategic_factory,
+			advanced_factory, fort_level, naval_capacity, std::move(colonial_points), in_province, one_per_state,
+			colonial_range, infrastructure, spawn_railway_track, sail, steam, capital, port
 		);
 
 		return ret;