diff options
| author | WBoerenkamps <wrj.boerenkamps@student.avans.nl> | 2024-10-25 21:14:09 +0200 |
|---|---|---|
| committer | WBoerenkamps <wrj.boerenkamps@student.avans.nl> | 2024-10-25 21:14:09 +0200 |
| commit | 26bb39991aaebe3b7ef8869f217db490143bc0e6 (patch) | |
| tree | e3ec5530e298257ef347f996f0a2c5a150d099f7 /mwe/events/src/main.cpp | |
| parent | 15a4c4a1cf67e13be53ef423c51c56488f332ea9 (diff) | |
merge conflicts fixed
Diffstat (limited to 'mwe/events/src/main.cpp')
| -rw-r--r-- | mwe/events/src/main.cpp | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/mwe/events/src/main.cpp b/mwe/events/src/main.cpp index 971ca35..d056f85 100644 --- a/mwe/events/src/main.cpp +++ b/mwe/events/src/main.cpp @@ -3,13 +3,9 @@ #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) @@ -17,15 +13,9 @@ public: 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; @@ -35,7 +25,6 @@ void onPlayerDamaged(const PlayerDamagedEvent & e) { << " damage." << std::endl; } -<<<<<<< HEAD void onKeyPressed1(const KeyPressedEvent& e) { int keyCode = e.getKeyCode(); @@ -54,11 +43,6 @@ 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[]) { LoopManager gameLoop; @@ -69,20 +53,11 @@ int main(int argc, char * args[]) { // 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(); |