feat: improved identifier registry macro

1 files changed, 4 insertions, 11 deletions

diff --git a/src/openvic-simulation/interface/UI.hpp b/src/openvic-simulation/interface/UI.hpp
index 045766b..12eadb5 100644
--- a/src/openvic-simulation/interface/UI.hpp
+++ b/src/openvic-simulation/interface/UI.hpp
@@ -4,21 +4,14 @@
 
 namespace OpenVic {
 
-	class UIManager {
-
-		NamedInstanceRegistry<GFX::Sprite> sprites;
-		NamedInstanceRegistry<GUI::Scene, UIManager const&> scenes;
-		IdentifierRegistry<GFX::Font> fonts;
+	class UIManager { 
+		NamedInstanceRegistry<GFX::Sprite> IDENTIFIER_REGISTRY(sprite);
+		NamedInstanceRegistry<GUI::Scene, UIManager const&> IDENTIFIER_REGISTRY(scene);
+		IdentifierRegistry<GFX::Font> IDENTIFIER_REGISTRY(font);
 
 		bool _load_font(ast::NodeCPtr node);
 
 	public:
-		UIManager();
-
-		IDENTIFIER_REGISTRY_ACCESSORS(sprite)
-		IDENTIFIER_REGISTRY_ACCESSORS(scene)
-		IDENTIFIER_REGISTRY_ACCESSORS(font)
-
 		bool add_font(std::string_view identifier, colour_t colour, std::string_view fontname);
 
 		bool load_gfx_file(ast::NodeCPtr root);