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

LogType -> string. Done.

Browse Source
This commit is contained in:
Steve Checkoway
2006-09-24 03:57:40 +00:00
parent c8a2b7601c
commit 1345a2cd5f
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/BannerCache.cpp
+2 -2
View File
@@ -297,7 +297,7 @@ RageTextureID BannerCache::LoadCachedBanner( RString BannerPath )
BannerData.GetValue( BannerPath, "Rotated", WasRotatedBanner ); BannerData.GetValue( BannerPath, "Rotated", WasRotatedBanner );
if(src_width == 0 || src_height == 0) if(src_width == 0 || src_height == 0)
{ {
LOG->UserLog( RageLog::LogType_CacheFile, BannerPath, "couldn't be loaded." ); LOG->UserLog( "Cache file", BannerPath, "couldn't be loaded." );
return ID; return ID;
} }
@@ -377,7 +377,7 @@ void BannerCache::CacheBannerInternal( RString BannerPath )
RageSurface *img = RageSurfaceUtils::LoadFile( BannerPath, error ); RageSurface *img = RageSurfaceUtils::LoadFile( BannerPath, error );
if( img == NULL ) if( img == NULL )
{ {
LOG->UserLog( RageLog::LogType_CacheFile, BannerPath, "couldn't be loaded: %s", error.c_str() ); LOG->UserLog( "Cache file", BannerPath, "couldn't be loaded: %s", error.c_str() );
return; return;
} }
stepmania/src/NoteDataUtil.cpp
+1 -1
View File
@@ -219,7 +219,7 @@ static void LoadFromSMNoteDataStringWithPlayer( NoteData& out, const RString &sS
if( tn.type == TapNote::hold_head && tn.iDuration == MAX_NOTE_ROW ) if( tn.type == TapNote::hold_head && tn.iDuration == MAX_NOTE_ROW )
{ {
int iRow = begin->first; int iRow = begin->first;
LOG->UserLog( RageLog::LogType_General, "", "While loading SM note data, there was an unmatched 2 at beat %f", NoteRowToBeat(iRow) ); LOG->UserLog( "", "", "While loading SM note data, there was an unmatched 2 at beat %f", NoteRowToBeat(iRow) );
out.RemoveTapNote( t, begin ); out.RemoveTapNote( t, begin );
} }
stepmania/src/PlayerOptions.cpp
+2 -2
View File
@@ -245,7 +245,7 @@ void PlayerOptions::FromString( const RString &sOptions, bool bWarnOnInvalid )
{ {
if( bWarnOnInvalid ) if( bWarnOnInvalid )
{ {
LOG->UserLog( RageLog::LogType_General, "", "Invalid player options \"%s\"; did you mean '*%d'?", LOG->UserLog( "", "", "Invalid player options \"%s\"; did you mean '*%d'?",
s->c_str(), atoi(*s) ); s->c_str(), atoi(*s) );
} }
// XXX We know what they want, is there any reason not to handle it? // XXX We know what they want, is there any reason not to handle it?
@@ -361,7 +361,7 @@ void PlayerOptions::FromString( const RString &sOptions, bool bWarnOnInvalid )
if( bWarnOnInvalid ) if( bWarnOnInvalid )
{ {
RString sWarning = ssprintf( "The options string \"%s\" contains an invalid mod name \"%s\".", sOptions.c_str(), sBit.c_str() ); RString sWarning = ssprintf( "The options string \"%s\" contains an invalid mod name \"%s\".", sOptions.c_str(), sBit.c_str() );
LOG->UserLog( RageLog::LogType_General, "", "%s", sWarning.c_str() ); LOG->UserLog( "", "", "%s", sWarning.c_str() );
Dialog::OK( sWarning, "INVALID_PLAYER_OPTION_WARNING" ); Dialog::OK( sWarning, "INVALID_PLAYER_OPTION_WARNING" );
} }
} }
stepmania/src/RageSurface_Load.cpp
+1 -1
View File
@@ -108,7 +108,7 @@ RageSurface *RageSurfaceUtils::LoadFile( const RString &sPath, RString &error, b
RageSurface *ret = TryOpenFile( sPath, bHeaderOnly, error, *it, bKeepTrying ); RageSurface *ret = TryOpenFile( sPath, bHeaderOnly, error, *it, bKeepTrying );
if( ret ) if( ret )
{ {
LOG->UserLog( RageLog::LogType_GraphicFile, sPath, "is really %s", it->c_str() ); LOG->UserLog( "Graphic file", sPath, "is really %s", it->c_str() );
return ret; return ret;
} }
} }
stepmania/src/ThemeManager.cpp
+3 -3
View File
@@ -757,7 +757,7 @@ try_element_again:
ReloadMetrics(); ReloadMetrics();
goto try_element_again; goto try_element_again;
case Dialog::ignore: case Dialog::ignore:
LOG->UserLog( RageLog::LogType_ThemeElement, sCategory + '/' + sFileName, LOG->UserLog( "Theme element", sCategory + '/' + sFileName,
"could not be found in \"%s\" or \"%s\".", "could not be found in \"%s\" or \"%s\".",
GetThemeDirFromName(m_sCurThemeName).c_str(), GetThemeDirFromName(m_sCurThemeName).c_str(),
GetThemeDirFromName(SpecialFiles::BASE_THEME_NAME).c_str() ); GetThemeDirFromName(SpecialFiles::BASE_THEME_NAME).c_str() );
@@ -769,7 +769,7 @@ try_element_again:
Cache[sFileName] = GetPath( category, "", "_missing" ); Cache[sFileName] = GetPath( category, "", "_missing" );
return Cache[sFileName]; return Cache[sFileName];
case Dialog::abort: case Dialog::abort:
LOG->UserLog( RageLog::LogType_ThemeElement, sCategory + '/' + sFileName, LOG->UserLog( "Theme element", sCategory + '/' + sFileName,
"could not be found in \"%s\" or \"%s\".", "could not be found in \"%s\" or \"%s\".",
GetThemeDirFromName(m_sCurThemeName).c_str(), GetThemeDirFromName(m_sCurThemeName).c_str(),
GetThemeDirFromName(SpecialFiles::BASE_THEME_NAME).c_str() ); GetThemeDirFromName(SpecialFiles::BASE_THEME_NAME).c_str() );
@@ -880,7 +880,7 @@ RString ThemeManager::GetMetricRaw( const IniFile &ini, const RString &sClassNam
ReloadMetrics(); ReloadMetrics();
continue; continue;
case Dialog::ignore: case Dialog::ignore:
LOG->UserLog( RageLog::LogType_ThemeMetric, sClassName + " : " + sValueName, LOG->UserLog( "Theme metric", sClassName + " : " + sValueName,
"could not be found in \"%s\" or \"%s\".", "could not be found in \"%s\" or \"%s\".",
sCurMetricPath.c_str(), sDefaultMetricPath.c_str() ); sCurMetricPath.c_str(), sDefaultMetricPath.c_str() );
return RString(); return RString();