Refactor by Spartan

Author: wvpm

src/openvic-simulation/InstanceManager.cpp

@@ -97,7 +97,7 @@ InstanceManager::InstanceManager(
 	},
 	simulation_clock {
 		[this]() -> void {
-			queue_game_action<game_action_enum::tick>();
+			queue_game_action<tick_argument_t>();
 		},
 		[this]() -> void {
 			execute_game_actions();
@@ -336,7 +336,7 @@ void InstanceManager::update_modifier_sums() {
 	);
 }
 
-bool InstanceManager::queue_game_action(const game_action_t game_action) {
+bool InstanceManager::queue_game_action(game_action_t&& game_action) {
 	if (currently_executing_game_actions) {
 		spdlog::error_s("Attempted to queue a game action while already executing game actions!");
 		return false;

src/openvic-simulation/InstanceManager.hpp

@@ -99,15 +99,15 @@ namespace OpenVic {
 
 		bool set_today_and_update(Date new_today);
 
-		template<game_action_enum I, typename... Args>
+		template<typename T, typename... Args>
 		bool queue_game_action(Args&&... args) {
 			return queue_game_action(
 				game_action_t(
-					std::in_place_index<static_cast<std::size_t>(I)>,
-					std::forward(args)...
+					std::in_place_type<T>,
+					std::forward<Args>(args)...
 				)
 			);
 		}
-		bool queue_game_action(game_action_t game_action);
+		bool queue_game_action(game_action_t&& game_action);
 	};
 }

src/openvic-simulation/misc/GameAction.cpp

@@ -6,32 +6,29 @@
 
 using namespace OpenVic;
 
-GameActionManager::GameActionManager(InstanceManager& new_instance_manager)
-	: instance_manager { new_instance_manager } {}
-
-bool GameActionManager::none(none_argument_t const& argument) const {
+bool GameActionManager::VariantVisitor::operator() (none_argument_t const& argument) const {
 	return false;
 }
 
 // Core
-bool GameActionManager::tick(tick_argument_t const& argument) const {
+bool GameActionManager::VariantVisitor::operator() (tick_argument_t const& argument) const {
 	instance_manager.tick();
 	return true;
 }
 
-bool GameActionManager::set_pause(set_pause_argument_t const& new_is_paused) const {
+bool GameActionManager::VariantVisitor::operator() (set_pause_argument_t const& new_is_paused) const {
 	const bool old_pause = instance_manager.get_simulation_clock().is_paused();
-	instance_manager.get_simulation_clock().set_paused(new_is_paused);
+	instance_manager.get_simulation_clock().set_paused(type_safe::get(new_is_paused));
 	return old_pause != instance_manager.get_simulation_clock().is_paused();
 }
 
-bool GameActionManager::set_speed(set_speed_argument_t const& new_speed) const {
+bool GameActionManager::VariantVisitor::operator() (set_speed_argument_t const& new_speed) const {
 	const SimulationClock::speed_t old_speed = instance_manager.get_simulation_clock().get_simulation_speed();
-	instance_manager.get_simulation_clock().set_simulation_speed(new_speed);
+	instance_manager.get_simulation_clock().set_simulation_speed(type_safe::get(new_speed));
 	return old_speed != instance_manager.get_simulation_clock().get_simulation_speed();
 }
 
-bool GameActionManager::set_ai(set_ai_argument_t const& argument) const {
+bool GameActionManager::VariantVisitor::operator() (set_ai_argument_t const& argument) const {
 	const auto [country_index, new_is_ai] = argument;
 	CountryInstance* country = instance_manager.get_country_instance_manager().get_country_instance_by_index(country_index);
 
@@ -46,7 +43,7 @@ bool GameActionManager::set_ai(set_ai_argument_t const& argument) const {
 }
 
 // Production
-bool GameActionManager::expand_province_building(expand_province_building_argument_t const& argument) const {
+bool GameActionManager::VariantVisitor::operator() (expand_province_building_argument_t const& argument) const {
 	const auto [province_index, building_type_index] = argument;
 	ProvinceInstance* province = instance_manager.get_map_instance().get_province_instance_by_index(province_index);
 
@@ -59,7 +56,7 @@ bool GameActionManager::expand_province_building(expand_province_building_argume
 }
 
 // Budget
-bool GameActionManager::set_strata_tax(set_strata_tax_argument_t const& argument) const {
+bool GameActionManager::VariantVisitor::operator() (set_strata_tax_argument_t const& argument) const {
 	const auto [country_index, strata_index, tax_rate] = argument;
 	CountryInstance* country = instance_manager.get_country_instance_manager().get_country_instance_by_index(country_index);
 
@@ -79,7 +76,7 @@ bool GameActionManager::set_strata_tax(set_strata_tax_argument_t const& argument
 	return false;
 }
 
-bool GameActionManager::set_army_spending(set_army_spending_argument_t const& argument) const {
+bool GameActionManager::VariantVisitor::operator() (set_army_spending_argument_t const& argument) const {
 	const auto [country_index, spending] = argument;
 	CountryInstance* country = instance_manager.get_country_instance_manager().get_country_instance_by_index(country_index);
 
@@ -92,7 +89,7 @@ bool GameActionManager::set_army_spending(set_army_spending_argument_t const& ar
 	return false;
 }
 
-bool GameActionManager::set_navy_spending(set_navy_spending_argument_t const& argument) const {
+bool GameActionManager::VariantVisitor::operator() (set_navy_spending_argument_t const& argument) const {
 	const auto [country_index, spending] = argument;
 	CountryInstance* country = instance_manager.get_country_instance_manager().get_country_instance_by_index(country_index);
 
@@ -105,7 +102,7 @@ bool GameActionManager::set_navy_spending(set_navy_spending_argument_t const& ar
 	return false;
 }
 
-bool GameActionManager::set_construction_spending(set_construction_spending_argument_t const& argument) const {
+bool GameActionManager::VariantVisitor::operator() (set_construction_spending_argument_t const& argument) const {
 	const auto [country_index, spending] = argument;
 	CountryInstance* country = instance_manager.get_country_instance_manager().get_country_instance_by_index(country_index);
 
@@ -118,7 +115,7 @@ bool GameActionManager::set_construction_spending(set_construction_spending_argu
 	return false;
 }
 
-bool GameActionManager::set_education_spending(set_education_spending_argument_t const& argument) const {
+bool GameActionManager::VariantVisitor::operator() (set_education_spending_argument_t const& argument) const {
 	const auto [country_index, spending] = argument;
 	CountryInstance* country = instance_manager.get_country_instance_manager().get_country_instance_by_index(country_index);
 
@@ -131,7 +128,7 @@ bool GameActionManager::set_education_spending(set_education_spending_argument_t
 	return false;
 }
 
-bool GameActionManager::set_administration_spending(set_administration_spending_argument_t const& argument) const {
+bool GameActionManager::VariantVisitor::operator() (set_administration_spending_argument_t const& argument) const {
 	const auto [country_index, spending] = argument;
 	CountryInstance* country = instance_manager.get_country_instance_manager().get_country_instance_by_index(country_index);
 
@@ -144,7 +141,7 @@ bool GameActionManager::set_administration_spending(set_administration_spending_
 	return false;
 }
 
-bool GameActionManager::set_social_spending(set_social_spending_argument_t const& argument) const {
+bool GameActionManager::VariantVisitor::operator() (set_social_spending_argument_t const& argument) const {
 	const auto [country_index, spending] = argument;
 	CountryInstance* country = instance_manager.get_country_instance_manager().get_country_instance_by_index(country_index);
 
@@ -157,7 +154,7 @@ bool GameActionManager::set_social_spending(set_social_spending_argument_t const
 	return false;
 }
 
-bool GameActionManager::set_military_spending(set_military_spending_argument_t const& argument) const {
+bool GameActionManager::VariantVisitor::operator() (set_military_spending_argument_t const& argument) const {
 	const auto [country_index, spending] = argument;
 	CountryInstance* country = instance_manager.get_country_instance_manager().get_country_instance_by_index(country_index);
 
@@ -170,7 +167,7 @@ bool GameActionManager::set_military_spending(set_military_spending_argument_t c
 	return false;
 }
 
-bool GameActionManager::set_tariff_rate(set_tariff_rate_argument_t const& argument) const {
+bool GameActionManager::VariantVisitor::operator() (set_tariff_rate_argument_t const& argument) const {
 	const auto [country_index, tariff_rate] = argument;
 	CountryInstance* country = instance_manager.get_country_instance_manager().get_country_instance_by_index(country_index);
 
@@ -184,7 +181,7 @@ bool GameActionManager::set_tariff_rate(set_tariff_rate_argument_t const& argume
 }
 
 // Technology
-bool GameActionManager::start_research(start_research_argument_t const& argument) const {
+bool GameActionManager::VariantVisitor::operator() (start_research_argument_t const& argument) const {
 	const auto [country_index, technology_index] = argument;
 	CountryInstance* country = instance_manager.get_country_instance_manager().get_country_instance_by_index(country_index);
 
@@ -215,7 +212,7 @@ bool GameActionManager::start_research(start_research_argument_t const& argument
 // Population
 
 // Trade
-bool GameActionManager::set_good_automated(set_good_automated_argument_t const& argument) const {
+bool GameActionManager::VariantVisitor::operator() (set_good_automated_argument_t const& argument) const {
 	const auto [country_index, good_index, new_is_automated] = argument;
 	CountryInstance* country = instance_manager.get_country_instance_manager().get_country_instance_by_index(country_index);
 
@@ -240,7 +237,7 @@ bool GameActionManager::set_good_automated(set_good_automated_argument_t const&
 	return old_automated != good_data.is_automated;
 }
 
-bool GameActionManager::set_good_trade_order(set_good_trade_order_argument_t const& argument) const {
+bool GameActionManager::VariantVisitor::operator() (set_good_trade_order_argument_t const& argument) const {
 	const auto [country_index, good_index, new_is_selling, new_cutoff] = argument;
 	CountryInstance* country = instance_manager.get_country_instance_manager().get_country_instance_by_index(country_index);
 
@@ -289,7 +286,7 @@ bool GameActionManager::set_good_trade_order(set_good_trade_order_argument_t con
 // Diplomacy
 
 // Military
-bool GameActionManager::create_leader(create_leader_argument_t const& argument) const {
+bool GameActionManager::VariantVisitor::operator() (create_leader_argument_t const& argument) const {
 	const auto [country_index, unit_branch] = argument;
 	CountryInstance* country = instance_manager.get_country_instance_manager().get_country_instance_by_index(country_index);
 
@@ -313,7 +310,7 @@ bool GameActionManager::create_leader(create_leader_argument_t const& argument)
 	);
 }
 
-bool GameActionManager::set_use_leader(set_use_leader_argument_t const& argument) const {
+bool GameActionManager::VariantVisitor::operator() (set_use_leader_argument_t const& argument) const {
 	const auto [unique_id, new_should_use] = argument;
 
 	LeaderInstance* leader = instance_manager.get_unit_instance_manager().get_leader_instance_by_unique_id(unique_id);
@@ -330,7 +327,7 @@ bool GameActionManager::set_use_leader(set_use_leader_argument_t const& argument
 	return old_use != leader->get_can_be_used();
 }
 
-bool GameActionManager::set_auto_create_leaders(set_auto_create_leaders_argument_t const& argument) const {
+bool GameActionManager::VariantVisitor::operator() (set_auto_create_leaders_argument_t const& argument) const {
 	const auto [country_index, new_should_auto_create] = argument;
 	CountryInstance* country = instance_manager.get_country_instance_manager().get_country_instance_by_index(country_index);
 
@@ -346,7 +343,7 @@ bool GameActionManager::set_auto_create_leaders(set_auto_create_leaders_argument
 	return old_auto_create != country->get_auto_create_leaders();
 }
 
-bool GameActionManager::set_auto_assign_leaders(set_auto_assign_leaders_argument_t const& argument) const {
+bool GameActionManager::VariantVisitor::operator() (set_auto_assign_leaders_argument_t const& argument) const {
 	const auto [country_index, new_should_auto_assign] = argument;
 	CountryInstance* country = instance_manager.get_country_instance_manager().get_country_instance_by_index(country_index);
 
@@ -362,7 +359,7 @@ bool GameActionManager::set_auto_assign_leaders(set_auto_assign_leaders_argument
 	return old_auto_assign != country->get_auto_assign_leaders();
 }
 
-bool GameActionManager::set_mobilise(set_mobilise_argument_t const& argument) const {
+bool GameActionManager::VariantVisitor::operator() (set_mobilise_argument_t const& argument) const {
 	const auto [country_index, new_is_mobilised] = argument;
 	CountryInstance* country = instance_manager.get_country_instance_manager().get_country_instance_by_index(country_index);