From c45d0c89c7c88c8d46963ccffa27f8bce22587b1 Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Tue, 9 Feb 2010 17:01:30 -0600 Subject: [PATCH] fc3d177: Fix GAMESTATE:GetCurrentSteps() only returning single-player steps for any difficulty [vyhd] --- src/GameState.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/GameState.cpp b/src/GameState.cpp index 8d1783e259..0bda2b54cc 100644 --- a/src/GameState.cpp +++ b/src/GameState.cpp @@ -2169,11 +2169,13 @@ public: if( p->m_pCurSong.Get() != NULL ) { - // try with the player's current steps first, since they're likely the correct ones. - pSteps = p->m_pCurSteps[pn]; + // try our preferred steps type and difficulty first + pSteps = SongUtil::GetOneSteps( p->m_pCurSong.Get(), GAMESTATE->m_PreferredStepsType, GAMESTATE->m_PreferredDifficulty[pn] ); + // no matches for preferred stepstype? try the current style if( pSteps == NULL ) pSteps = SongUtil::GetOneSteps( p->m_pCurSong.Get(), GAMESTATE->GetCurrentStyle()->m_StepsType, GAMESTATE->m_PreferredDifficulty[pn] ); + // nothing found with preferred difficulty? try with closest. // closest seems to return 'easy' when prefrred difficulty is 'medium' // even if the song has medium steps?