From a6ac154b944df3c1ff637481043e30873549c276 Mon Sep 17 00:00:00 2001 From: Kae <80987908+Novaenia@users.noreply.github.com> Date: Thu, 25 Jul 2024 08:56:00 +1000 Subject: accept 🎮 in mod bindings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/client/StarClientApplication.cpp | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) (limited to 'source/client/StarClientApplication.cpp') diff --git a/source/client/StarClientApplication.cpp b/source/client/StarClientApplication.cpp index 6cc6cf1..b3460c1 100644 --- a/source/client/StarClientApplication.cpp +++ b/source/client/StarClientApplication.cpp @@ -301,20 +301,19 @@ void ClientApplication::processInput(InputEvent const& event) { m_controllerRightStick[1] = cAxis->controllerAxisValue; } - if (!m_errorScreen->accepted() && m_errorScreen->handleInputEvent(event)) - return; - - bool processed = false; - - if (m_state == MainAppState::Splash) { - processed = m_cinematicOverlay->handleInputEvent(event); - } else if (m_state == MainAppState::Title) { - if (!(processed = m_cinematicOverlay->handleInputEvent(event))) - processed = m_titleScreen->handleInputEvent(event); - - } else if (m_state == MainAppState::SinglePlayer || m_state == MainAppState::MultiPlayer) { - if (!(processed = m_cinematicOverlay->handleInputEvent(event))) - processed = m_mainInterface->handleInputEvent(event); + bool processed = !m_errorScreen->accepted() && m_errorScreen->handleInputEvent(event); + + if (!processed) { + if (m_state == MainAppState::Splash) { + processed = m_cinematicOverlay->handleInputEvent(event); + } else if (m_state == MainAppState::Title) { + if (!(processed = m_cinematicOverlay->handleInputEvent(event))) + processed = m_titleScreen->handleInputEvent(event); + + } else if (m_state == MainAppState::SinglePlayer || m_state == MainAppState::MultiPlayer) { + if (!(processed = m_cinematicOverlay->handleInputEvent(event))) + processed = m_mainInterface->handleInputEvent(event); + } } m_input->handleInput(event, processed); -- cgit v1.2.3