(#1193) Use 'Esc' button to go back to level picker from level state

diff --git a/src/game.c b/src/game.c
index 818af559dff78f58acb40cdbef7059ee8588373b..2380343fd0bfad855b4f6d9925533014015c9190 100644 (file)
--- a/src/game.c
+++ b/src/game.c
@@ -368,6 +368,7 @@ static int game_event_level_picker(Game *game, const SDL_Event *event)
                 return -1;
             }
 
+            level_picker_clean_selection(game->level_picker);
             game_switch_state(game, GAME_STATE_LEVEL);
         } break;
 
@@ -402,6 +403,8 @@ static int game_event_level_editor(Game *game, const SDL_Event *event)
             if (game->level == NULL) {
                 return -1;
             }
+
+            level_picker_clean_selection(game->level_picker);
             game_switch_state(game, GAME_STATE_LEVEL);
         } break;
         }
@@ -466,8 +469,13 @@ int game_event(Game *game, const SDL_Event *event)
 
     // State event handling
     switch (game->state) {
-    case GAME_STATE_LEVEL:
+    case GAME_STATE_LEVEL: {
+        if (event->key.keysym.sym == SDLK_ESCAPE) {
+            game_switch_state(game, GAME_STATE_LEVEL_PICKER);
+            return 0;
+        }
         return game_event_running(game, event);
+    }
 
     case GAME_STATE_LEVEL_PICKER:
         return game_event_level_picker(game, event);
@@ -584,6 +592,7 @@ int game_load_level(Game *game, const char *level_filename)
         return -1;
     }
 
+    level_picker_clean_selection(game->level_picker);
     game_switch_state(game, GAME_STATE_LEVEL);
 
     return 0;