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

Cleanup.

Browse Source
This commit is contained in:
Steve Checkoway
2006-09-04 05:26:34 +00:00
parent b791ce0c4c
commit 1ebea3ccf5
1 changed files with 36 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/NotesLoaderDWI.cpp
+8 -9
View File
@@ -165,8 +165,7 @@ bool DWILoader::LoadFromDWITokens(
g_mapDanceNoteToNoteDataColumn[DANCE_NOTE_PAD1_UPRIGHT] = 4; g_mapDanceNoteToNoteDataColumn[DANCE_NOTE_PAD1_UPRIGHT] = 4;
g_mapDanceNoteToNoteDataColumn[DANCE_NOTE_PAD1_RIGHT] = 5; g_mapDanceNoteToNoteDataColumn[DANCE_NOTE_PAD1_RIGHT] = 5;
break; break;
default: DEFAULT_FAIL( out.m_StepsType );
ASSERT(0);
} }
int iNumFeet = atoi(sNumFeet); int iNumFeet = atoi(sNumFeet);
@@ -190,8 +189,7 @@ bool DWILoader::LoadFromDWITokens(
continue; // skip continue; // skip
sStepData = sStepData2; sStepData = sStepData2;
break; break;
default: DEFAULT_FAIL( pad );
ASSERT( false );
} }
sStepData.Replace("\n", ""); sStepData.Replace("\n", "");
@@ -337,20 +335,21 @@ bool DWILoader::LoadFromDWITokens(
* or milliseconds. */ * or milliseconds. */
float DWILoader::ParseBrokenDWITimestamp(const RString &arg1, const RString &arg2, const RString &arg3) float DWILoader::ParseBrokenDWITimestamp(const RString &arg1, const RString &arg2, const RString &arg3)
{ {
if(arg1.empty()) return 0; if( arg1.empty() )
return 0;
/* 1+ args */ /* 1+ args */
if(arg2.empty()) if( arg2.empty() )
{ {
/* If the value contains a period, treat it as seconds; otherwise ms. */ /* If the value contains a period, treat it as seconds; otherwise ms. */
if(arg1.find_first_of(".") != arg1.npos) if( arg1.find_first_of(".") != arg1.npos )
return StringToFloat( arg1 ); return StringToFloat( arg1 );
else else
return StringToFloat( arg1 ) / 1000.f; return StringToFloat( arg1 ) / 1000.f;
} }
/* 2+ args */ /* 2+ args */
if(arg3.empty()) if( arg3.empty() )
return HHMMSSToSeconds( arg1+":"+arg2 ); return HHMMSSToSeconds( arg1+":"+arg2 );
/* 3+ args */ /* 3+ args */
@@ -375,7 +374,7 @@ bool DWILoader::LoadFromDWIFile( const RString &sPath, Song &out )
const MsdFile::value_t &sParams = msd.GetValue(i); const MsdFile::value_t &sParams = msd.GetValue(i);
RString sValueName = sParams[0]; RString sValueName = sParams[0];
if(iNumParams < 1) if( iNumParams < 1 )
{ {
LOG->UserLog( "Got \"%s\" tag with no parameters in '%s'", sValueName.c_str(), m_sLoadingFile.c_str() ); LOG->UserLog( "Got \"%s\" tag with no parameters in '%s'", sValueName.c_str(), m_sLoadingFile.c_str() );
continue; continue;