diff options
| author | WBoerenkamps <wrj.boerenkamps@student.avans.nl> | 2024-10-25 20:59:34 +0200 |
|---|---|---|
| committer | WBoerenkamps <wrj.boerenkamps@student.avans.nl> | 2024-10-25 20:59:34 +0200 |
| commit | 15a4c4a1cf67e13be53ef423c51c56488f332ea9 (patch) | |
| tree | 661084fc8171089ce32bf779f2b3a85d634b38e4 /mwe/gameloop | |
| parent | f472e0ba3bf54fc5055cf9f08925bed3f98a1dbc (diff) | |
| parent | b3b762a34e7ccb4a0dcd041a693ac7180af16002 (diff) | |
merge conficts fixed
Diffstat (limited to 'mwe/gameloop')
| -rw-r--r-- | mwe/gameloop/include/eventManager.h | 4 | ||||
| -rw-r--r-- | mwe/gameloop/include/loopManager.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mwe/gameloop/include/eventManager.h b/mwe/gameloop/include/eventManager.h index ba1ca32..a1b9f92 100644 --- a/mwe/gameloop/include/eventManager.h +++ b/mwe/gameloop/include/eventManager.h @@ -1,5 +1,5 @@ #pragma once class EventManager { - public: - EventManager(); +public: + EventManager(); }; diff --git a/mwe/gameloop/include/loopManager.h b/mwe/gameloop/include/loopManager.h index dcbfedc..1befb69 100644 --- a/mwe/gameloop/include/loopManager.h +++ b/mwe/gameloop/include/loopManager.h @@ -1,8 +1,8 @@ #pragma once +#include "event.h" #include "gameObject.h" #include "window.h" #include <SDL2/SDL.h> -#include "event.h" class LoopManager { public: LoopManager(); |