Merge pull request #132 from OpenVicProject/enum-tweaks

Minor enum cleanup, changed string functions into stream overloads

2 files changed, 30 insertions, 30 deletions

diff --git a/src/openvic-simulation/military/Wargoal.cpp b/src/openvic-simulation/military/Wargoal.cpp
index 6351ce3..4045fa5 100644
--- a/src/openvic-simulation/military/Wargoal.cpp
+++ b/src/openvic-simulation/military/Wargoal.cpp
@@ -41,7 +41,7 @@ bool WargoalTypeManager::add_wargoal_type(
 	std::string_view identifier, std::string_view war_name, Timespan available_length,
 	Timespan truce_length, WargoalType::sprite_t sprite_index, bool triggered_only, bool civil_war,
 	bool constructing, bool crisis, bool great_war_obligatory, bool mutual, bool all_allowed_states,
-	bool always, WargoalType::peace_modifiers_t&& modifiers, peace_options_t peace_options,
+	bool always, WargoalType::peace_modifiers_t&& modifiers, WargoalType::peace_options_t peace_options,
 	ConditionScript&& can_use, ConditionScript&& is_valid, ConditionScript&& allowed_states,
 	ConditionScript&& allowed_substate_regions, ConditionScript&& allowed_states_in_crisis,
 	ConditionScript&& allowed_countries, EffectScript&& on_add, EffectScript&& on_po_accepted
@@ -75,14 +75,14 @@ bool WargoalTypeManager::load_wargoal_file(ast::NodeCPtr root) {
 				return true;
 			}
 
-			using enum peace_options_t;
+			using enum WargoalType::peace_options_t;
 
 			std::string_view war_name;
 			Timespan available {}, truce {};
 			WargoalType::sprite_t sprite_index = 0;
 			bool triggered_only = false, civil_war = false, constructing = true, crisis = true, great_war_obligatory = false,
 				mutual = false, all_allowed_states = false, always = false;
-			peace_options_t peace_options = NO_PEACE_OPTIONS;
+			WargoalType::peace_options_t peace_options = NO_PEACE_OPTIONS;
 			WargoalType::peace_modifiers_t modifiers;
 			ConditionScript can_use { scope_t::COUNTRY, scope_t::COUNTRY, scope_t::COUNTRY };
 			ConditionScript is_valid { scope_t::COUNTRY, scope_t::COUNTRY, scope_t::COUNTRY };
@@ -92,7 +92,7 @@ bool WargoalTypeManager::load_wargoal_file(ast::NodeCPtr root) {
 			ConditionScript allowed_countries { scope_t::COUNTRY, scope_t::COUNTRY, scope_t::COUNTRY };
 			EffectScript on_add, on_po_accepted; //country as default scope for both
 
-			const auto expect_peace_option = [&peace_options](peace_options_t peace_option) -> node_callback_t {
+			const auto expect_peace_option = [&peace_options](WargoalType::peace_options_t peace_option) -> node_callback_t {
 				return expect_bool([&peace_options, peace_option](bool val) -> bool {
 					if (val) {
 						peace_options |= peace_option;
diff --git a/src/openvic-simulation/military/Wargoal.hpp b/src/openvic-simulation/military/Wargoal.hpp
index a4f2e7c..d9d51f6 100644
--- a/src/openvic-simulation/military/Wargoal.hpp
+++ b/src/openvic-simulation/military/Wargoal.hpp
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "openvic-simulation/misc/Modifier.hpp"
 #include "openvic-simulation/scripts/ConditionScript.hpp"
 #include "openvic-simulation/scripts/EffectScript.hpp"
 #include "openvic-simulation/types/EnumBitfield.hpp"
@@ -10,35 +9,12 @@
 namespace OpenVic {
 	struct WargoalTypeManager;
 
-	enum class peace_options_t : uint32_t {
-		NO_PEACE_OPTIONS      = 0,
-		PO_ANNEX              = 1 << 0,
-		PO_DEMAND_STATE       = 1 << 1,
-		PO_COLONY             = 1 << 2,
-		PO_ADD_TO_SPHERE      = 1 << 3,
-		PO_DISARMAMENT        = 1 << 4,
-		PO_REMOVE_FORTS       = 1 << 5,
-		PO_REMOVE_NAVAL_BASES = 1 << 6,
-		PO_REPARATIONS        = 1 << 7,
-		PO_REPAY_DEBT         = 1 << 8,
-		PO_REMOVE_PRESTIGE    = 1 << 9,
-		PO_MAKE_PUPPET        = 1 << 10,
-		PO_RELEASE_PUPPET     = 1 << 11,
-		PO_STATUS_QUO         = 1 << 12,
-		PO_INSTALL_COMMUNISM  = 1 << 13,
-		PO_REMOVE_COMMUNISM   = 1 << 14,
-		PO_REMOVE_CORES       = 1 << 15, // only usable with ANNEX, DEMAND_STATE, or TRANSFER_PROVINCES
-		PO_TRANSFER_PROVINCES = 1 << 16,
-		PO_CLEAR_UNION_SPHERE = 1 << 17
-	};
-	template<> struct enable_bitfield<peace_options_t> : std::true_type{};
-
 	struct WargoalType : HasIdentifier {
 		friend struct WargoalTypeManager;
 
 		using sprite_t = uint8_t;
 
-		enum class PEACE_MODIFIERS {
+		enum class PEACE_MODIFIERS : uint8_t {
 			BADBOY_FACTOR,
 			PRESTIGE_FACTOR,
 			PEACE_COST_FACTOR,
@@ -54,6 +30,28 @@ namespace OpenVic {
 		};
 		using peace_modifiers_t = fixed_point_map_t<PEACE_MODIFIERS>;
 
+		enum class peace_options_t : uint32_t {
+			NO_PEACE_OPTIONS      = 0,
+			PO_ANNEX              = 1 << 0,
+			PO_DEMAND_STATE       = 1 << 1,
+			PO_COLONY             = 1 << 2,
+			PO_ADD_TO_SPHERE      = 1 << 3,
+			PO_DISARMAMENT        = 1 << 4,
+			PO_REMOVE_FORTS       = 1 << 5,
+			PO_REMOVE_NAVAL_BASES = 1 << 6,
+			PO_REPARATIONS        = 1 << 7,
+			PO_REPAY_DEBT         = 1 << 8,
+			PO_REMOVE_PRESTIGE    = 1 << 9,
+			PO_MAKE_PUPPET        = 1 << 10,
+			PO_RELEASE_PUPPET     = 1 << 11,
+			PO_STATUS_QUO         = 1 << 12,
+			PO_INSTALL_COMMUNISM  = 1 << 13,
+			PO_REMOVE_COMMUNISM   = 1 << 14,
+			PO_REMOVE_CORES       = 1 << 15, // only usable with ANNEX, DEMAND_STATE, or TRANSFER_PROVINCES
+			PO_TRANSFER_PROVINCES = 1 << 16,
+			PO_CLEAR_UNION_SPHERE = 1 << 17
+		};
+
 	private:
 		std::string PROPERTY(war_name);
 		const Timespan PROPERTY(available_length);
@@ -94,6 +92,8 @@ namespace OpenVic {
 		WargoalType(WargoalType&&) = default;
 	};
 
+	template<> struct enable_bitfield<WargoalType::peace_options_t> : std::true_type{};
+
 	struct WargoalTypeManager {
 	private:
 		IdentifierRegistry<WargoalType> IDENTIFIER_REGISTRY(wargoal_type);
@@ -104,7 +104,7 @@ namespace OpenVic {
 			std::string_view identifier, std::string_view war_name, Timespan available_length,
 			Timespan truce_length, WargoalType::sprite_t sprite_index, bool triggered_only, bool civil_war,
 			bool constructing, bool crisis, bool great_war_obligatory, bool mutual, bool all_allowed_states,
-			bool always, WargoalType::peace_modifiers_t&& modifiers, peace_options_t peace_options,
+			bool always, WargoalType::peace_modifiers_t&& modifiers, WargoalType::peace_options_t peace_options,
 			ConditionScript&& can_use, ConditionScript&& is_valid, ConditionScript&& allowed_states,
 			ConditionScript&& allowed_substate_regions, ConditionScript&& allowed_states_in_crisis,
 			ConditionScript&& allowed_countries, EffectScript&& on_add, EffectScript&& on_po_accepted