Allow ESC to quit login screen and do GUI logic before drawing.

2 files changed, 8 insertions, 4 deletions

diff --git a/src/game.cpp b/src/game.cpp
index bfea0f35..e042d344 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -108,8 +108,8 @@ void game() {
     while (state != EXIT)
     {
         do_input();
-        engine->draw();
         gui->logic();
+        engine->draw();
         graphics->updateScreen();
         do_parse();
         flush();
diff --git a/src/gui/login.cpp b/src/gui/login.cpp
index b0ee3076..5496c01b 100644
--- a/src/gui/login.cpp
+++ b/src/gui/login.cpp
@@ -140,6 +140,13 @@ void login() {
                 case SDL_QUIT:
                     state = EXIT;
                     break;
+
+                case SDL_KEYDOWN:
+                    if (event.key.keysym.sym == SDLK_ESCAPE)
+                    {
+                        state = EXIT;
+                    }
+                    break;
             }
 
             guiInput->pushInput(event);
@@ -149,9 +156,6 @@ void login() {
         gui->logic();
         gui->draw();
         guiGraphics->updateScreen();
-        //if (key[KEY_ESC]) {
-        //    state = EXIT;
-        //}
     }
 
     delete dialog;