diff options
author | George L. Albany <Megacake1234@gmail.com> | 2024-01-01 04:32:01 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-01-01 04:32:01 +0100 |
commit | 9988b21278dc1c8df044631bd2935a7e450a7bff (patch) | |
tree | ba081f9f4d74865ab5851a2efd560745900ca81a /src/openvic-simulation/politics | |
parent | 0a425fbe05d6138b753c0e4a7c06f06695bde8af (diff) | |
parent | e1496a87178d925277aceed0ebcbab06920e15ee (diff) |
Merge pull request #105 from OpenVicProject/add/ordered-map
Diffstat (limited to 'src/openvic-simulation/politics')
-rw-r--r-- | src/openvic-simulation/politics/Rebel.hpp | 9 | ||||
-rw-r--r-- | src/openvic-simulation/politics/Rule.hpp | 3 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/openvic-simulation/politics/Rebel.hpp b/src/openvic-simulation/politics/Rebel.hpp index 29ae3ae..f7e8795 100644 --- a/src/openvic-simulation/politics/Rebel.hpp +++ b/src/openvic-simulation/politics/Rebel.hpp @@ -1,11 +1,12 @@ #pragma once +#include <cstdint> + #include "openvic-simulation/misc/Modifier.hpp" -#include "openvic-simulation/types/IdentifierRegistry.hpp" #include "openvic-simulation/politics/Government.hpp" #include "openvic-simulation/politics/Ideology.hpp" -#include <cstdint> -#include <unordered_map> +#include "openvic-simulation/types/IdentifierRegistry.hpp" +#include "openvic-simulation/types/OrderedContainers.hpp" namespace OpenVic { struct RebelManager; @@ -13,7 +14,7 @@ namespace OpenVic { struct RebelType : HasIdentifier { friend struct RebelManager; - using government_map_t = std::unordered_map<GovernmentType const*, GovernmentType const*>; + using government_map_t = ordered_map<GovernmentType const*, GovernmentType const*>; using icon_t = uint16_t; enum class area_t { diff --git a/src/openvic-simulation/politics/Rule.hpp b/src/openvic-simulation/politics/Rule.hpp index 260fb9e..4b47abf 100644 --- a/src/openvic-simulation/politics/Rule.hpp +++ b/src/openvic-simulation/politics/Rule.hpp @@ -1,6 +1,7 @@ #pragma once #include "openvic-simulation/types/IdentifierRegistry.hpp" +#include "openvic-simulation/types/OrderedContainers.hpp" namespace OpenVic { struct RuleManager; @@ -18,7 +19,7 @@ namespace OpenVic { struct RuleSet { friend struct RuleManager; - using rule_map_t = std::map<Rule const*, bool>; + using rule_map_t = ordered_map<Rule const*, bool>; private: rule_map_t rules; |