1 files changed, 17 insertions, 12 deletions

@@ -5,6 +5,7 @@
 #include "script_system.h"
 #include "transform_system.h"
 #include "animation_system.h"
+#include "menu_system.h"
 
 struct Input {
   bool left = false;
@@ -16,25 +17,29 @@ struct Input {
 void InputSystem::tick(double dt) {
   SDL_Event e;
   while (SDL_PollEvent(&e)) {
-    if (e.type == SDL_KEYDOWN && e.key.keysym.sym == SDLK_ESCAPE) {
-      if (debugConsole_) {
-        debugConsole_ = false;
-        game_.unpauseGameplay();
-        SDL_StopTextInput();
-        debugText_.clear();
-      } else {
-        game_.quit();
-      }
-    } else if (e.type == SDL_QUIT) {
+    if (e.type == SDL_QUIT) {
       game_.quit();
 
       return;
     } else if (e.type == SDL_TEXTINPUT) {
       debugText_.append(e.text.text);
     } else if (e.type == SDL_KEYDOWN) {
-      if (e.key.keysym.sym == SDLK_BACKQUOTE) {
+      if (e.key.keysym.sym == SDLK_ESCAPE) {
+        if (debugConsole_) {
+          debugConsole_ = false;
+          game_.unpauseGameplay();
+          SDL_StopTextInput();
+          debugText_.clear();
+        } else {
+          if (game_.getSystem<MenuSystem>().isMenuOpen()) {
+            game_.getSystem<MenuSystem>().closePauseMenu();
+          } else if (!game_.isGameplayPaused()) {
+            game_.getSystem<MenuSystem>().openPauseMenu();
+          }
+        }
+      } else if (e.key.keysym.sym == SDLK_BACKQUOTE) {
 #ifdef TANETANE_DEBUG
-        if (!debugConsole_) {
+        if (!debugConsole_ && !game_.isGameplayPaused()) {
           debugConsole_ = true;
           game_.pauseGameplay();
           SDL_StartTextInput();