]> git.lizzy.rs Git - nothing.git/commitdiff
(#1193) Take into account console event handler
authorgooddoog <gooddoog@student.su>
Sun, 8 Dec 2019 13:42:36 +0000 (16:42 +0300)
committergooddoog <gooddoog@student.su>
Sun, 8 Dec 2019 13:42:36 +0000 (16:42 +0300)
src/game.c

index 2380343fd0bfad855b4f6d9925533014015c9190..2dd10049a0919bc10c4cf6393748f844ad89cfa7 100644 (file)
@@ -464,18 +464,22 @@ int game_event(Game *game, const SDL_Event *event)
             } break;
             }
         } break;
+        case SDL_KEYDOWN: {
+            switch (event->key.keysym.sym) {
+            case SDLK_ESCAPE: {
+                if (game->state == GAME_STATE_LEVEL) {
+                    game_switch_state(game, GAME_STATE_LEVEL_PICKER);
+                }
+            } break;
+            }
+        } break;
         }
     }
 
     // State event handling
     switch (game->state) {
-    case GAME_STATE_LEVEL: {
-        if (event->key.keysym.sym == SDLK_ESCAPE) {
-            game_switch_state(game, GAME_STATE_LEVEL_PICKER);
-            return 0;
-        }
+    case GAME_STATE_LEVEL:
         return game_event_running(game, event);
-    }
 
     case GAME_STATE_LEVEL_PICKER:
         return game_event_level_picker(game, event);