Merge branch 'master' of https://github.com/Drewol/unnamed-sdvx-clone …

…into laser-changes
Drewol · Dec 13, 2020 · 86f7722 · 86f7722
2 parents 961d4f7 + 41804b7
commit 86f7722
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/Main/src/ChallengeSelect.cpp b/Main/src/ChallengeSelect.cpp
@@ -1669,6 +1669,11 @@ bool ChallengeManager::m_setupNextChart()
 	else
 		flags = GameFlags::None;
 
+	//TODO(itszn) should we have an option to force effective
+	GaugeTypes gaugeType = g_gameConfig.GetEnum<Enum_GaugeTypes>(GameConfigKeys::GaugeType);
+	if (gaugeType == GaugeTypes::Hard)
+		flags = flags | GameFlags::Hard;
+
 	if (m_currentOptions.mirror.Get(false))
 		flags = flags | GameFlags::Mirror;
 

diff --git a/Main/src/Game.cpp b/Main/src/Game.cpp
@@ -2178,7 +2178,7 @@ class Game_Impl : public Game
 			if(!SkipIntro() && !m_isPracticeSetup)
 				SkipOutro();
 		}
-		else if(code == SDL_SCANCODE_PAGEUP && !IsMultiplayerGame() && IsChallenge())
+		else if(code == SDL_SCANCODE_PAGEUP && !IsMultiplayerGame() && !IsChallenge())
 		{
 			m_audioPlayback.Advance(5000);
 		}