actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't invalidate the current song or steps until after the music wheel has been constructed, so that themes can safely touch it when handling current song changed.

Browse Source
This commit is contained in:
Kyzentun Keeslala
2016-05-19 11:19:55 -06:00
parent 7091685514
commit 4361bcd7e3
1 changed files with 28 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/MusicWheel.cpp
+28 -23
View File
@@ -183,29 +183,6 @@ void MusicWheel::BeginScreen()
if( GAMESTATE->m_PreferredSortOrder == SortOrder_Invalid )
GAMESTATE->m_PreferredSortOrder = GAMESTATE->m_SortOrder;
/* Invalidate current Song if it can't be played
* because there are not enough stages remaining. */
if( GAMESTATE->m_pCurSong != NULL &&
GameState::GetNumStagesMultiplierForSong( GAMESTATE->m_pCurSong ) > GAMESTATE->GetSmallestNumStagesLeftForAnyHumanPlayer() )
{
GAMESTATE->m_pCurSong.Set( NULL );
}
/* Invalidate current Steps if it can't be played
* because there are not enough stages remaining. */
FOREACH_ENUM( PlayerNumber, p )
{
if( GAMESTATE->m_pCurSteps[p] != NULL )
{
vector<Steps*> vpPossibleSteps;
if( GAMESTATE->m_pCurSong != NULL )
SongUtil::GetPlayableSteps( GAMESTATE->m_pCurSong, vpPossibleSteps );
bool bStepsIsPossible = find( vpPossibleSteps.begin(), vpPossibleSteps.end(), GAMESTATE->m_pCurSteps[p] ) == vpPossibleSteps.end();
if( !bStepsIsPossible )
GAMESTATE->m_pCurSteps[p].Set( NULL );
}
}
if(GAMESTATE->m_sPreferredSongGroup != GROUP_ALL)
{
// If a preferred song group is set, open the group and select the
@@ -241,6 +218,34 @@ void MusicWheel::BeginScreen()
// rebuild the WheelItems that appear on screen
RebuildWheelItems();
/* Invalidate current Song if it can't be played
* because there are not enough stages remaining. */
if(GAMESTATE->m_pCurSong != NULL &&
GameState::GetNumStagesMultiplierForSong(GAMESTATE->m_pCurSong) >
GAMESTATE->GetSmallestNumStagesLeftForAnyHumanPlayer())
{
GAMESTATE->m_pCurSong.Set(NULL);
}
/* Invalidate current Steps if it can't be played
* because there are not enough stages remaining. */
FOREACH_ENUM(PlayerNumber, p)
{
if(GAMESTATE->m_pCurSteps[p] != NULL)
{
vector<Steps*> vpPossibleSteps;
if(GAMESTATE->m_pCurSong != NULL)
{
SongUtil::GetPlayableSteps(GAMESTATE->m_pCurSong, vpPossibleSteps);
}
bool bStepsIsPossible = find(vpPossibleSteps.begin(), vpPossibleSteps.end(), GAMESTATE->m_pCurSteps[p]) == vpPossibleSteps.end();
if(!bStepsIsPossible)
{
GAMESTATE->m_pCurSteps[p].Set(NULL);
}
}
}
}
MusicWheel::~MusicWheel()