Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/events-poc

1 files changed, 5 insertions, 5 deletions

diff --git a/mwe/events/include/event.h b/mwe/events/include/event.h
index b1b6867..62d8974 100644
--- a/mwe/events/include/event.h
+++ b/mwe/events/include/event.h
@@ -1,4 +1,5 @@
 #pragma once
+#include "customTypes.h"
 #include "keyCodes.h"
 #include <cstdint>
 #include <iostream>
@@ -129,15 +130,14 @@ private:
 };
 class CollisionEvent : public Event {
 public:
-    CollisionEvent(Collision);
+	CollisionEvent(Collision);
 
-    REGISTER_EVENT_TYPE(CollisionEvent)
+	REGISTER_EVENT_TYPE(CollisionEvent)
 
-    Collision getCollisionData() const;
+	Collision getCollisionData() const;
 
 private:
-   	Collision collisionData;
-    
+	Collision collisionData;
 };
 class TextSubmitEvent : public Event {
 public: