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

LogType -> string.

Browse Source
This commit is contained in:
Steve Checkoway
2006-09-24 03:57:26 +00:00
parent b1a6f94d69
commit c8a2b7601c
10 changed files with 77 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/NotesLoaderDWI.cpp
+10 -10
View File
@@ -60,7 +60,7 @@ void DWILoader::DWIcharToNote( char c, GameController i, int &note1Out, int &not
case 'L': note1Out = DANCE_NOTE_PAD1_UPRIGHT; note2Out = DANCE_NOTE_PAD1_RIGHT; break;
case 'M': note1Out = DANCE_NOTE_PAD1_UPLEFT; note2Out = DANCE_NOTE_PAD1_UPRIGHT; break;
default:
LOG->UserLog( RageLog::LogType_SongFile, m_sLoadingFile, "has an invalid DWI note character '%c'.", c );
LOG->UserLog( "Song file", m_sLoadingFile, "has an invalid DWI note character '%c'.", c );
note1Out = DANCE_NOTE_NONE; note2Out = DANCE_NOTE_NONE; break;
}
@@ -232,7 +232,7 @@ bool DWILoader::LoadFromDWITokens(
{
if( c == '!' )
{
LOG->UserLog( RageLog::LogType_SongFile, m_sLoadingFile, "has an unexpected character: '!'." );
LOG->UserLog( "Song file", m_sLoadingFile, "has an unexpected character: '!'." );
continue;
}
@@ -314,7 +314,7 @@ bool DWILoader::LoadFromDWITokens(
if( !bFound )
{
/* The hold was never closed. */
LOG->UserLog( RageLog::LogType_SongFile, m_sLoadingFile, "failed to close a hold note in \"%s\" on track %i",
LOG->UserLog( "Song file", m_sLoadingFile, "failed to close a hold note in \"%s\" on track %i",
sDescription.c_str(), t );
newNoteData.SetTapNote( t, iHeadRow, TAP_EMPTY );
@@ -364,7 +364,7 @@ bool DWILoader::LoadFromDWIFile( const RString &sPath, Song &out )
MsdFile msd;
if( !msd.ReadFile( sPath ) )
{
LOG->UserLog( RageLog::LogType_SongFile, sPath, "couldn't be opened: %s", msd.GetError().c_str() );
LOG->UserLog( "Song file", sPath, "couldn't be opened: %s", msd.GetError().c_str() );
return false;
}
@@ -376,7 +376,7 @@ bool DWILoader::LoadFromDWIFile( const RString &sPath, Song &out )
if( iNumParams < 1 )
{
LOG->UserLog( RageLog::LogType_SongFile, sPath, "has tag \"%s\" with no parameters.", sValueName.c_str() );
LOG->UserLog( "Song file", sPath, "has tag \"%s\" with no parameters.", sValueName.c_str() );
continue;
}
@@ -410,7 +410,7 @@ bool DWILoader::LoadFromDWIFile( const RString &sPath, Song &out )
if( fBPM > 0.0f )
out.AddBPMSegment( BPMSegment(0, fBPM) );
else
LOG->UserLog( RageLog::LogType_SongFile, sPath, "has an invalid BPM change at beat %f, BPM %f.",
LOG->UserLog( "Song file", sPath, "has an invalid BPM change at beat %f, BPM %f.",
NoteRowToBeat(0), fBPM );
}
else if( 0==stricmp(sValueName,"DISPLAYBPM") )
@@ -458,7 +458,7 @@ bool DWILoader::LoadFromDWIFile( const RString &sPath, Song &out )
split( arrayFreezeExpressions[f], "=", arrayFreezeValues );
if( arrayFreezeValues.size() != 2 )
{
LOG->UserLog( RageLog::LogType_SongFile, sPath, "has an invalid FREEZE: '%s'.", arrayFreezeExpressions[f].c_str() );
LOG->UserLog( "Song file", sPath, "has an invalid FREEZE: '%s'.", arrayFreezeExpressions[f].c_str() );
continue;
}
int iFreezeRow = BeatToNoteRow( StringToFloat(arrayFreezeValues[0]) / 4.0f );
@@ -480,7 +480,7 @@ bool DWILoader::LoadFromDWIFile( const RString &sPath, Song &out )
split( arrayBPMChangeExpressions[b], "=", arrayBPMChangeValues );
if( arrayBPMChangeValues.size() != 2 )
{
LOG->UserLog( RageLog::LogType_SongFile, m_sLoadingFile, "has an invalid CHANGEBPM: '%s'.", arrayBPMChangeExpressions[b].c_str() );
LOG->UserLog( "Song file", m_sLoadingFile, "has an invalid CHANGEBPM: '%s'.", arrayBPMChangeExpressions[b].c_str() );
continue;
}
@@ -493,7 +493,7 @@ bool DWILoader::LoadFromDWIFile( const RString &sPath, Song &out )
}
else
{
LOG->UserLog( RageLog::LogType_SongFile, m_sLoadingFile, "has an invalid BPM change at beat %f, BPM %f.",
LOG->UserLog( "Song file", m_sLoadingFile, "has an invalid BPM change at beat %f, BPM %f.",
NoteRowToBeat(iStartIndex), fBPM );
}
}
@@ -564,7 +564,7 @@ bool DWILoader::LoadFromDir( const RString &sPath, Song &out )
if( aFileNames.size() > 1 )
{
LOG->UserLog( RageLog::LogType_Song, sPath, "has more than one DWI file. There should be only one!" );
LOG->UserLog( "Song", sPath, "has more than one DWI file. There should be only one!" );
return false;
}