Merge pull request #91 from OpenVicProject/registry-macro

Improved identifier registry macro

1 files changed, 1 insertions, 4 deletions

diff --git a/src/openvic-simulation/misc/Event.hpp b/src/openvic-simulation/misc/Event.hpp
index 6d0829e..d1f7963 100644
--- a/src/openvic-simulation/misc/Event.hpp
+++ b/src/openvic-simulation/misc/Event.hpp
@@ -65,11 +65,9 @@ namespace OpenVic {
 
 	struct EventManager {
 	private:
-		IdentifierRegistry<Event> events;
+		IdentifierRegistry<Event> IDENTIFIER_REGISTRY(event);
 
 	public:
-		EventManager();
-
 		bool register_event(
 			std::string_view identifier, std::string_view title, std::string_view description, std::string_view image,
 			Event::event_type_t type, bool triggered_only, bool major, bool fire_only_once, bool allows_multiple_instances,
@@ -77,7 +75,6 @@ namespace OpenVic {
 			std::string_view news_desc_short, bool election, IssueGroup const* election_issue_group,
 			std::vector<Event::EventOption>&& options
 		);
-		IDENTIFIER_REGISTRY_ACCESSORS(event);
 
 		bool load_event_file(IssueManager const& issue_manager, ast::NodeCPtr root);
 	};