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

Cleanup.

Browse Source
This commit is contained in:
Steve Checkoway
2006-06-20 06:48:30 +00:00
parent 8bef98e7b6
commit 5e7ac2deed
1 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/NoteDataUtil.cpp
+8 -16
View File
@@ -72,8 +72,8 @@ void NoteDataUtil::LoadFromSMNoteDataString( NoteData &out, RString sSMNoteData
for( unsigned m=0; m<asMeasures.size(); m++ ) // foreach measure for( unsigned m=0; m<asMeasures.size(); m++ ) // foreach measure
{ {
RString &sMeasureString = asMeasures[m]; RString &sMeasureString = asMeasures[m];
TrimLeft(sMeasureString); TrimLeft( sMeasureString );
TrimRight(sMeasureString); TrimRight( sMeasureString );
vector<RString> asMeasureLines; vector<RString> asMeasureLines;
split( sMeasureString, "\n", asMeasureLines, true ); // ignore empty is important split( sMeasureString, "\n", asMeasureLines, true ); // ignore empty is important
@@ -81,8 +81,8 @@ void NoteDataUtil::LoadFromSMNoteDataString( NoteData &out, RString sSMNoteData
for( unsigned l=0; l<asMeasureLines.size(); l++ ) for( unsigned l=0; l<asMeasureLines.size(); l++ )
{ {
RString &sMeasureLine = asMeasureLines[l]; RString &sMeasureLine = asMeasureLines[l];
TrimLeft(sMeasureLine); TrimLeft( sMeasureLine );
TrimRight(sMeasureLine); TrimRight( sMeasureLine );
const float fPercentIntoMeasure = l/(float)asMeasureLines.size(); const float fPercentIntoMeasure = l/(float)asMeasureLines.size();
const float fBeat = (m + fPercentIntoMeasure) * BEATS_PER_MEASURE; const float fBeat = (m + fPercentIntoMeasure) * BEATS_PER_MEASURE;
@@ -100,7 +100,7 @@ void NoteDataUtil::LoadFromSMNoteDataString( NoteData &out, RString sSMNoteData
switch( ch ) switch( ch )
{ {
case '0': tn = TAP_EMPTY; break; case '0': tn = TAP_EMPTY; break;
case '1': tn = TAP_ORIGINAL_TAP; break; case '1': tn = TAP_ORIGINAL_TAP; break;
case '2': case '2':
case '4': case '4':
@@ -138,7 +138,7 @@ void NoteDataUtil::LoadFromSMNoteDataString( NoteData &out, RString sSMNoteData
// that's what we've been writing to disk. -Chris // that's what we've been writing to disk. -Chris
case 'M': tn = TAP_ORIGINAL_MINE; break; case 'M': tn = TAP_ORIGINAL_MINE; break;
// case 'A': tn = TAP_ORIGINAL_ATTACK; break; // case 'A': tn = TAP_ORIGINAL_ATTACK; break;
case 'K': tn = TAP_ORIGINAL_AUTO_KEYSOUND; break; case 'K': tn = TAP_ORIGINAL_AUTO_KEYSOUND; break;
default: default:
/* Invalid data. We don't want to assert, since there might /* Invalid data. We don't want to assert, since there might
* simply be invalid data in an .SM, and we don't want to die * simply be invalid data in an .SM, and we don't want to die
@@ -169,12 +169,8 @@ void NoteDataUtil::LoadFromSMNoteDataString( NoteData &out, RString sSMNoteData
// skip past the '}' // skip past the '}'
while( *p ) while( *p )
{ {
if( *p == '}' ) if( *(p++) == '}' )
{
p++;
break; break;
}
p++;
} }
} }
#endif #endif
@@ -193,12 +189,8 @@ void NoteDataUtil::LoadFromSMNoteDataString( NoteData &out, RString sSMNoteData
// skip past the ']' // skip past the ']'
while( *p ) while( *p )
{ {
if( *p == ']' ) if( *(p++) == ']' )
{
p++;
break; break;
}
p++;
} }
} }