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

fix up formatting

Browse Source
This commit is contained in:
Glenn Maynard
2004-11-13 20:48:28 +00:00
parent 53857a39ff
commit 75f0dee79c
1 changed files with 66 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/NotesLoaderBMS.cpp
+4 -5
View File
@@ -887,7 +887,7 @@ bool BMSLoader::LoadFromDir( CString sDir, Song &out )
if( aBMSData.size() >= 2 ) if( aBMSData.size() >= 2 )
{ {
for(unsigned i=0; i < aBMSData.size(); i++ ) for( unsigned i=0; i < aBMSData.size(); i++ )
{ {
CString sTitle; // Declare here for less memory thrashing CString sTitle; // Declare here for less memory thrashing
if( GetTagFromMap( aBMSData[i], "#title", sTitle ) ) if( GetTagFromMap( aBMSData[i], "#title", sTitle ) )
@@ -940,15 +940,14 @@ bool BMSLoader::LoadFromDir( CString sDir, Song &out )
if( sTag.Find("l") != sTag.npos ) if( sTag.Find("l") != sTag.npos )
pSteps->SetDifficulty( DIFFICULTY_EASY ); pSteps->SetDifficulty( DIFFICULTY_EASY );
// [A] <A> (A) [ANOTHER] <ANOTHER> (ANOTHER) (ANOTHER7) Another (DP ANOTHER) (Another) -ANOTHER- [A7] [A14] etc etc etc // [A] <A> (A) [ANOTHER] <ANOTHER> (ANOTHER) (ANOTHER7) Another (DP ANOTHER) (Another) -ANOTHER- [A7] [A14] etc etc etc
else else if( sTag.Find("a") != sTag.npos )
if( sTag.Find("a") != sTag.npos )
pSteps->SetDifficulty( DIFFICULTY_HARD ); pSteps->SetDifficulty( DIFFICULTY_HARD );
// Other tags I've seen here include (5KEYS) (10KEYS) (7keys) (14keys) (dp) [MIX] [14] (14 Keys Mix) // Other tags I've seen here include (5KEYS) (10KEYS) (7keys) (14keys) (dp) [MIX] [14] (14 Keys Mix)
// XXX: I'm sure [MIX] means something... anyone know? // XXX: I'm sure [MIX] means something... anyone know?
} }
} }
if ( commonSubstring == "" ) if( commonSubstring == "" )
{ {
// As said before, all bets are off. // As said before, all bets are off.
// From here on in, it's nothing but guesswork. // From here on in, it's nothing but guesswork.
@@ -980,7 +979,7 @@ bool BMSLoader::LoadFromDir( CString sDir, Song &out )
// Override what that global tag said about the title if we have a good substring. // Override what that global tag said about the title if we have a good substring.
// Prevents clobbering and catches "D2R (7keys)" / "D2R (Another) (7keys)" // Prevents clobbering and catches "D2R (7keys)" / "D2R (Another) (7keys)"
// Also catches "D2R (7keys)" / "D2R (14keys)" // Also catches "D2R (7keys)" / "D2R (14keys)"
if (commonSubstring != "" ) if( commonSubstring != "" )
GetMainAndSubTitlesFromFullTitle( commonSubstring, out.m_sMainTitle, out.m_sSubTitle ); GetMainAndSubTitlesFromFullTitle( commonSubstring, out.m_sMainTitle, out.m_sSubTitle );
// Now that we've parsed the keysound data, load the Steps from the rest // Now that we've parsed the keysound data, load the Steps from the rest