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

Experiment over, dance is the default game again.

Browse Source
This commit is contained in:
AJ Kelly
2011-09-07 17:44:37 -05:00
parent 52838f28c2
commit a0455b4fd2
2 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/GameManager.cpp
+1 -1
View File
@@ -2791,8 +2791,8 @@ static const Game g_Game_Lights =
static const Game *g_Games[] = static const Game *g_Games[] =
{ {
&g_Game_Pump,
&g_Game_Dance, &g_Game_Dance,
&g_Game_Pump,
&g_Game_KB7, &g_Game_KB7,
&g_Game_Ez2, &g_Game_Ez2,
&g_Game_Para, &g_Game_Para,
src/SongManager.cpp
+13 -2
View File
@@ -59,7 +59,6 @@ static Preference<bool> g_bHideIncompleteCourses( "HideIncompleteCourses", false
RString SONG_GROUP_COLOR_NAME( size_t i ) { return ssprintf( "SongGroupColor%i", (int) i+1 ); } RString SONG_GROUP_COLOR_NAME( size_t i ) { return ssprintf( "SongGroupColor%i", (int) i+1 ); }
RString COURSE_GROUP_COLOR_NAME( size_t i ) { return ssprintf( "CourseGroupColor%i", (int) i+1 ); } RString COURSE_GROUP_COLOR_NAME( size_t i ) { return ssprintf( "CourseGroupColor%i", (int) i+1 ); }
SongManager::SongManager() SongManager::SongManager()
{ {
// Register with Lua. // Register with Lua.
@@ -585,7 +584,6 @@ RageColor SongManager::GetCourseColor( const Course* pCourse ) const
if( pUE && USE_UNLOCK_COLOR.GetValue() ) if( pUE && USE_UNLOCK_COLOR.GetValue() )
return UNLOCK_COLOR.GetValue(); return UNLOCK_COLOR.GetValue();
if( USE_PREFERRED_SORT_COLOR ) if( USE_PREFERRED_SORT_COLOR )
{ {
FOREACH_CONST( CoursePointerVector, m_vPreferredCourseSort, v ) FOREACH_CONST( CoursePointerVector, m_vPreferredCourseSort, v )
@@ -780,6 +778,7 @@ void SongManager::InitCoursesFromDisk( LoadingWindow *ld )
vsCourseGroupNames.push_back( SpecialFiles::COURSES_DIR ); vsCourseGroupNames.push_back( SpecialFiles::COURSES_DIR );
SortRStringArray( vsCourseGroupNames ); SortRStringArray( vsCourseGroupNames );
int courseIndex = 0;
FOREACH_CONST( RString, vsCourseGroupNames, sCourseGroup ) // for each dir in /Courses/ FOREACH_CONST( RString, vsCourseGroupNames, sCourseGroup ) // for each dir in /Courses/
{ {
// Find all CRS files in this group directory // Find all CRS files in this group directory
@@ -787,10 +786,17 @@ void SongManager::InitCoursesFromDisk( LoadingWindow *ld )
GetDirListing( *sCourseGroup + "/*.crs", vsCoursePaths, false, true ); GetDirListing( *sCourseGroup + "/*.crs", vsCoursePaths, false, true );
SortRStringArray( vsCoursePaths ); SortRStringArray( vsCoursePaths );
if( ld )
{
ld->SetIndeterminate( false );
ld->SetTotalWork( vsCoursePaths.size() );
}
FOREACH_CONST( RString, vsCoursePaths, sCoursePath ) FOREACH_CONST( RString, vsCoursePaths, sCoursePath )
{ {
if( ld ) if( ld )
{ {
ld->SetProgress(courseIndex);
ld->SetText( LOADING_COURSES.GetValue()+ssprintf("\n%s\n%s", ld->SetText( LOADING_COURSES.GetValue()+ssprintf("\n%s\n%s",
Basename(*sCourseGroup).c_str(), Basename(*sCourseGroup).c_str(),
Basename(*sCoursePath).c_str())); Basename(*sCoursePath).c_str()));
@@ -806,9 +812,14 @@ void SongManager::InitCoursesFromDisk( LoadingWindow *ld )
} }
m_pCourses.push_back( pCourse ); m_pCourses.push_back( pCourse );
courseIndex++;
} }
} }
if( ld ) {
ld->SetIndeterminate( true );
}
RefreshCourseGroupInfo(); RefreshCourseGroupInfo();
} }