aboutsummaryrefslogtreecommitdiff
path: root/src/openvic-simulation/pop/Religion.hpp
diff options
context:
space:
mode:
author zaaarf <80046572+zaaarf@users.noreply.github.com>2023-12-10 23:17:04 +0100
committer GitHub <noreply@github.com>2023-12-10 23:17:04 +0100
commit34fbe27857d77d6f193d6d1848b953a4596cedd2 (patch)
tree7f07835485b877f3c01c52c188892499e5812f9b /src/openvic-simulation/pop/Religion.hpp
parent1eb28bd4fb959b69a30013f6438f0257a2ee7b03 (diff)
parent4ef33d4df6198e613b0f27406d49978c8ea2fb97 (diff)
Merge pull request #91 from OpenVicProject/registry-macro
Improved identifier registry macro
Diffstat (limited to 'src/openvic-simulation/pop/Religion.hpp')
-rw-r--r--src/openvic-simulation/pop/Religion.hpp8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/openvic-simulation/pop/Religion.hpp b/src/openvic-simulation/pop/Religion.hpp
index 6f34eee..14c2f57 100644
--- a/src/openvic-simulation/pop/Religion.hpp
+++ b/src/openvic-simulation/pop/Religion.hpp
@@ -38,19 +38,15 @@ namespace OpenVic {
struct ReligionManager {
private:
- IdentifierRegistry<ReligionGroup> religion_groups;
- IdentifierRegistry<Religion> religions;
+ IdentifierRegistry<ReligionGroup> IDENTIFIER_REGISTRY(religion_group);
+ IdentifierRegistry<Religion> IDENTIFIER_REGISTRY(religion);
public:
- ReligionManager();
-
bool add_religion_group(std::string_view identifier);
- IDENTIFIER_REGISTRY_ACCESSORS(religion_group)
bool add_religion(
std::string_view identifier, colour_t colour, ReligionGroup const& group, Religion::icon_t icon, bool pagan
);
- IDENTIFIER_REGISTRY_ACCESSORS(religion)
bool load_religion_file(ast::NodeCPtr root);
};