diff --git a/desktop_version/src/KeyPoll.cpp b/desktop_version/src/KeyPoll.cpp index c6cdb4e5..697ca615 100644 --- a/desktop_version/src/KeyPoll.cpp +++ b/desktop_version/src/KeyPoll.cpp @@ -5,6 +5,7 @@ #include #include +#include "Exit.h" #include "Game.h" #include "Graphics.h" #include "Music.h" @@ -36,7 +37,6 @@ KeyPoll::KeyPoll(void) // 0..5 sensitivity = 2; - quitProgram = 0; keybuffer=""; leftbutton=0; rightbutton=0; middlebutton=0; mx=0; my=0; @@ -339,7 +339,7 @@ void KeyPoll::Poll(void) /* Quit Event */ case SDL_QUIT: - quitProgram = true; + VVV_exit(0); break; } } diff --git a/desktop_version/src/KeyPoll.h b/desktop_version/src/KeyPoll.h index 9635aa3b..2c5c7532 100644 --- a/desktop_version/src/KeyPoll.h +++ b/desktop_version/src/KeyPoll.h @@ -37,7 +37,6 @@ public: bool resetWindow; - bool quitProgram; void toggleFullscreen(void); int sensitivity; diff --git a/desktop_version/src/main.cpp b/desktop_version/src/main.cpp index 9727c52f..1d99f5c2 100644 --- a/desktop_version/src/main.cpp +++ b/desktop_version/src/main.cpp @@ -615,7 +615,7 @@ int main(int argc, char *argv[]) gamestate_funcs = get_gamestate_funcs(game.gamestate, &num_gamestate_funcs); loop_assign_active_funcs(); - while(!key.quitProgram) + while (true) { f_time = SDL_GetTicks();