1 files changed, 40 insertions, 12 deletions

diff --git a/mwe/events/src/main.cpp b/mwe/events/src/main.cpp
index 6b22008..971ca35 100644
--- a/mwe/events/src/main.cpp
+++ b/mwe/events/src/main.cpp
@@ -1,27 +1,41 @@
+#include "event.h"
+#include "loopManager.h"
 #include <SDL2/SDL.h>
 #include <iostream>
 #include <memory>
+<<<<<<< HEAD
 #include "loopManager.h"
 #include "event.h"
 #include "customTypes.h"
+=======
+
+>>>>>>> b3b762a34e7ccb4a0dcd041a693ac7180af16002
 class PlayerDamagedEvent : public Event {
 public:
-    PlayerDamagedEvent(int damage, int playerID)
-        : Event("PlayerDamaged"), damage(damage), playerID(playerID) {}
+	PlayerDamagedEvent(int damage, int playerID)
+		: Event("PlayerDamaged"), damage(damage), playerID(playerID) {}
 
-    REGISTER_EVENT_TYPE(PlayerDamagedEvent);
+	REGISTER_EVENT_TYPE(PlayerDamagedEvent);
 
+<<<<<<< HEAD
     int getDamage() const { return damage; }
     int getPlayerID() const { return playerID; }
 	
+=======
+	int getDamage() const { return damage; }
+	int getPlayerID() const { return playerID; }
+
+>>>>>>> b3b762a34e7ccb4a0dcd041a693ac7180af16002
 private:
-    int damage;
-    int playerID;
+	int damage;
+	int playerID;
 };
-void onPlayerDamaged(const PlayerDamagedEvent& e) {
-    std::cout << "Player " << e.getPlayerID() << " took " << e.getDamage() << " damage." << std::endl;
+void onPlayerDamaged(const PlayerDamagedEvent & e) {
+	std::cout << "Player " << e.getPlayerID() << " took " << e.getDamage()
+			  << " damage." << std::endl;
 }
 
+<<<<<<< HEAD
 void onKeyPressed1(const KeyPressedEvent& e)
 {
    int keyCode = e.getKeyCode();
@@ -40,28 +54,42 @@ void testCollisionEvent() {
 	subscribe<CollisionEvent>(CollisionHandler,1);
 	// EventHandler<PlayerDamagedEvent>
 	triggerEvent(CollisionEvent(testCollision), 1);
+=======
+void onKeyPressed(const KeyPressedEvent & e) {
+	const int keyCode = e.getKeyCode();
+	fprintf(stderr, "KeyCode %d\n", keyCode);
+>>>>>>> b3b762a34e7ccb4a0dcd041a693ac7180af16002
 }
-int main(int argc, char* args[]) {
+int main(int argc, char * args[]) {
 	LoopManager gameLoop;
 	// Create an event handler for KeyPressedEvent
-    // EventHandler<KeyPressedEvent> callback = [](const KeyPressedEvent& e) {
-    //     onKeyPressed(e);
-    // };
+	// EventHandler<KeyPressedEvent> callback = [](const KeyPressedEvent& e) {
+	//     onKeyPressed(e);
+	// };
 	// custom event class poc
 	subscribe<PlayerDamagedEvent>(onPlayerDamaged);
 	triggerEvent(PlayerDamagedEvent(50, 1));
+<<<<<<< HEAD
     subscribe<KeyPressedEvent>(onKeyPressed,1,false);
     subscribe<KeyPressedEvent>(onKeyPressed1,false);
     // queueEvent(std::move(anotherKeyPressEvent));
     triggerEvent(KeyPressedEvent(42), 1);
 	
+=======
+	//EventHandler<KeyPressedEvent> callback = onKeyPressed;
+	//subscribe<KeyPressedEvent>(callback,false);
+	std::unique_ptr<Event> anotherKeyPressEvent
+		= std::make_unique<KeyPressedEvent>(65);
+	queueEvent(std::move(anotherKeyPressEvent));
+	triggerEvent(KeyPressedEvent(42));
+>>>>>>> b3b762a34e7ccb4a0dcd041a693ac7180af16002
 	EventManager::getInstance().dispatchEvents();
 	//collision event call
 	testCollisionEvent();
 	
 	gameLoop.setup();
 	gameLoop.loop();
-    return 0;
+	return 0;
 }
 // void collisionUpdate(){
 // 	int count;