diff --git a/lib/Ray/sources/Window.cpp b/lib/Ray/sources/Window.cpp index 43cd18cf..d3de0bc8 100644 --- a/lib/Ray/sources/Window.cpp +++ b/lib/Ray/sources/Window.cpp @@ -49,7 +49,7 @@ bool RAY::Window::open(void) } InitWindow(this->_dimensions.x, this->_dimensions.y, this->_title.c_str()); this->_isOpen = true; - //this->setExitKey(Controller::Keyboard::Key::KEY_M); + this->setExitKey(Controller::Keyboard::Key::KEY_DELETE); return true; } diff --git a/sources/Component/Keyboard/KeyboardComponent.hpp b/sources/Component/Keyboard/KeyboardComponent.hpp index ea58b239..e6b7eec0 100644 --- a/sources/Component/Keyboard/KeyboardComponent.hpp +++ b/sources/Component/Keyboard/KeyboardComponent.hpp @@ -21,7 +21,7 @@ namespace BBM //! @brief bomb key Key keyBomb = KEY_E; //! @brief pause key - Key keyPause = KEY_M; + Key keyPause = RAY::Controller::Keyboard::Key::KEY_ESCAPE; //! @brief move right key Key keyRight = KEY_A; //! @brief move left key diff --git a/sources/Runner/Runner.cpp b/sources/Runner/Runner.cpp index 9a6948f6..b4790520 100644 --- a/sources/Runner/Runner.cpp +++ b/sources/Runner/Runner.cpp @@ -67,6 +67,7 @@ namespace BBM return; gameState._loadedScenes[gameState.currentScene] = engine.scene; engine.scene = gameState._loadedScenes[gameState.nextScene]; + gameState.currentScene = gameState.nextScene; } void Runner::addSystems(WAL::Wal &wal) @@ -210,9 +211,9 @@ namespace BBM scene->addEntity("background") .addComponent() .addComponent("assets/plain_menu_background.png"); - scene->addEntity("logo") + scene->addEntity("pause text") .addComponent(1920 / 3, 180, 0) - .addComponent("assets/logo_small.png"); + .addComponent("PAUSE", 120, RAY::Vector2(), ORANGE); auto &play = scene->addEntity("play button") .addComponent(1920 / 2.5, 1080 - 540, 0) .addComponent("assets/buttons/button_back.png")