fix #190, pressing B will now skip "You Died"

tizian · Mar 17, 2018 · 4dbe7a2 · 4dbe7a2
1 parent db6f418
commit 4dbe7a2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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<LevelInterface*>(m_interface)->restoreConsumedFood();
 			onBackToCheckpoint();
 		}

diff --git 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;