From 4dbe7a268b7c0db162f553a7ca34fb27a54e634a Mon Sep 17 00:00:00 2001 From: Ironbell Date: Sat, 17 Mar 2018 11:06:05 +0100 Subject: [PATCH] fix #190, pressing B will now skip "You Died" --- src/Screens/LevelScreen.cpp | 4 ++-- src/Structs/ConfigurationData.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Screens/LevelScreen.cpp b/src/Screens/LevelScreen.cpp index e7de89e2..de84a743 100644 --- a/src/Screens/LevelScreen.cpp +++ b/src/Screens/LevelScreen.cpp @@ -460,7 +460,7 @@ void LevelScreen::handleBookWindow(const sf::Time& frameTime) { } void LevelScreen::handleBackToCheckpoint() { - if (m_isBossDefeated) return; + if (m_isBossDefeated || m_isGameOver) return; if (g_inputController->isKeyJustPressed(Key::BackToCheckpoint)) { onBackToCheckpoint(); @@ -474,7 +474,7 @@ void LevelScreen::handleGameOver(const sf::Time& frameTime) { if (m_isGameOver) { if (m_respawnWaitTime == sf::Time::Zero) return; updateTime(m_respawnWaitTime, frameTime); - if (m_respawnWaitTime == sf::Time::Zero) { + if (m_respawnWaitTime == sf::Time::Zero || g_inputController->isKeyJustPressed(Key::BackToCheckpoint)) { dynamic_cast(m_interface)->restoreConsumedFood(); onBackToCheckpoint(); } diff --git a/src/Structs/ConfigurationData.cpp b/src/Structs/ConfigurationData.cpp index 704910b9..49dcd456 100644 --- a/src/Structs/ConfigurationData.cpp +++ b/src/Structs/ConfigurationData.cpp @@ -4,7 +4,7 @@ void ConfigurationData::resetToDefault() { #ifdef GERMAN_DEFAULT_LANGUAGE language = Language::Lang_DE; #else - language = Language::Lang_DE; + language = Language::Lang_EN; #endif isSoundOn = true; volumeSound = 100;