added loopTimer and eventManager to mediator and removed the singletons

1 files changed, 4 insertions, 4 deletions

diff --git a/src/crepe/manager/Mediator.h b/src/crepe/manager/Mediator.h
index cd96614..c72af8e 100644
--- a/src/crepe/manager/Mediator.h
+++ b/src/crepe/manager/Mediator.h
@@ -3,14 +3,14 @@
 #include "../util/OptionalRef.h"
 
 // TODO: remove these singletons:
-#include "EventManager.h"
 #include "SaveManager.h"
 
 namespace crepe {
 
 class ComponentManager;
 class SceneManager;
-class LoopTimer;
+class LoopTimerManager;
+class EventManager;
 /**
  * Struct to pass references to classes that would otherwise need to be singletons down to
  * other classes within the engine hierarchy. Made to prevent constant changes to subclasses to
@@ -27,8 +27,8 @@ struct Mediator {
 	OptionalRef<ComponentManager> component_manager;
 	OptionalRef<SceneManager> scene_manager;
 	OptionalRef<SaveManager> save_manager = SaveManager::get_instance();
-	OptionalRef<EventManager> event_manager = EventManager::get_instance();
-	OptionalRef<LoopTimer> loop_timer;
+	OptionalRef<EventManager> event_manager;
+	OptionalRef<LoopTimerManager> loop_timer;
 };
 
 } // namespace crepe