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

Cleaning up some merge junk that I missed.

Browse Source
This commit is contained in:
Henrik Andersson
2011-05-30 11:25:09 +02:00
parent 79998641c3
commit ca71c99f63
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/MusicWheel.cpp
+10 -4
View File
@@ -124,18 +124,21 @@ void MusicWheel::Load( RString sType )
void MusicWheel::BeginScreen()
{
RageTimer timer;
FOREACH_ENUM( SortOrder, so ) {
RString times;
FOREACH_ENUM( SortOrder, so ) {
if(m_WheelItemDatasStatus[so]!=INVALID) {
m_WheelItemDatasStatus[so]=NEEDREFILTER;
times += ssprintf( "%i:%.3f ", so, timer.GetDeltaTime() );
}
LOG->Trace( "MusicWheel sorting took: %s", times.c_str() );
if(g_bPrecacheAllSorts) {
readyWheelItemsData(so);
times += ssprintf( "%i:%.3f ", so, timer.GetDeltaTime() );
}
}
if(g_bPrecacheAllSorts) {
LOG->Trace( "MusicWheel sorting took: %s", times.c_str() );
}
// Set m_LastModeMenuItem to the first item that matches the current mode. (Do this
// after building wheel item data.)
@@ -1495,7 +1498,10 @@ void MusicWheel::PlayerJoined()
// We need to rebuild the wheel item data in this situation. -aj
if( !GAMESTATE->IsCourseMode() && !PREFSMAN->m_bAutogenSteps )
{
m_WheelItemDatasStatus [GAMESTATE->m_SortOrder]=INVALID;
if(m_WheelItemDatasStatus[GAMESTATE->m_SortOrder]!=INVALID)
m_WheelItemDatasStatus[GAMESTATE->m_SortOrder]=NEEDREFILTER;
RebuildWheelItems();
}
SetOpenSection( m_sExpandedSectionName );