Skip to content

Commit 9f728ad

Browse files
committed
input:
- fix handling of pausing, it no works as intended, as pressing <NavigationEvent::Back> also pauses the game
1 parent d153d4c commit 9f728ad

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

src/scenes/single_player_game/pause.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ namespace scenes {
4949
const auto navigation_event = input_manager->get_navigation_event(event);
5050

5151

52-
if (m_game_input->get_menu_event(event) == input::MenuEvent::OpenSettings) {
52+
if (m_game_input->get_menu_event(event) == input::MenuEvent::Pause) {
5353
m_should_unpause = true;
5454
return true;
5555
}

src/scenes/single_player_game/single_player_game.cpp

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
#include "helper/music_utils.hpp"
55
#include "helper/platform.hpp"
66
#include "input/game_input.hpp"
7+
#include "input/input.hpp"
78
#include "magic_enum.hpp"
89
#include "manager/music_manager.hpp"
910
#include "scenes/scene.hpp"
@@ -104,14 +105,14 @@ namespace scenes {
104105
m_game->render(service_provider);
105106
}
106107

107-
[[nodiscard]] bool SinglePlayerGame::handle_event(
108-
const std::shared_ptr<input::InputManager>& /*input_manager*/,
109-
const SDL_Event& event
110-
) {
108+
[[nodiscard]] bool
109+
SinglePlayerGame::handle_event(const std::shared_ptr<input::InputManager>& input_manager, const SDL_Event& event) {
111110

112111
const auto& game_input = m_game->game_input();
113112

114-
if (game_input->get_menu_event(event) == input::MenuEvent::Pause and not m_game->is_game_finished()) {
113+
if ((game_input->get_menu_event(event) == input::MenuEvent::Pause
114+
or input_manager->get_navigation_event(event) == input::NavigationEvent::BACK)
115+
and not m_game->is_game_finished()) {
115116
m_next_scene = NextScene::Pause;
116117
m_game->set_paused(true);
117118
return true;

0 commit comments

Comments
 (0)