diff options
Diffstat (limited to 'src/UIClass.cpp')
| -rw-r--r-- | src/UIClass.cpp | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/src/UIClass.cpp b/src/UIClass.cpp index 6bb8aec..bf76336 100644 --- a/src/UIClass.cpp +++ b/src/UIClass.cpp @@ -1,3 +1,4 @@ +<<<<<<< HEAD #include <UIClass.h> extern Player player; @@ -36,3 +37,27 @@ void UIClass::handleEvents(){ } } } +======= +#include <UIClass.h> + +void UIClass::handleEvents(){ + SDL_Event e; + while(SDL_PollEvent(&e)){ + switch(e.type){ + case SDL_QUIT: + gameRunning=false; + break; + case SDL_KEYDOWN: + switch(e.key.keysym.sym){ + case 27: + gameRunning=false; + break; + default: + break; + } + default: + break; + } + } +} +>>>>>>> origin/master |