diff --git a/stepmania/src/BannerCache.cpp b/stepmania/src/BannerCache.cpp index 754ce61f7a..d8cf79d48c 100644 --- a/stepmania/src/BannerCache.cpp +++ b/stepmania/src/BannerCache.cpp @@ -297,7 +297,7 @@ RageTextureID BannerCache::LoadCachedBanner( RString BannerPath ) BannerData.GetValue( BannerPath, "Rotated", WasRotatedBanner ); 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; } @@ -377,7 +377,7 @@ void BannerCache::CacheBannerInternal( RString BannerPath ) RageSurface *img = RageSurfaceUtils::LoadFile( BannerPath, error ); 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; } diff --git a/stepmania/src/NoteDataUtil.cpp b/stepmania/src/NoteDataUtil.cpp index 7a9f7fe14b..6561545c53 100644 --- a/stepmania/src/NoteDataUtil.cpp +++ b/stepmania/src/NoteDataUtil.cpp @@ -219,7 +219,7 @@ static void LoadFromSMNoteDataStringWithPlayer( NoteData& out, const RString &sS if( tn.type == TapNote::hold_head && tn.iDuration == MAX_NOTE_ROW ) { 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 ); } diff --git a/stepmania/src/PlayerOptions.cpp b/stepmania/src/PlayerOptions.cpp index cec4ec9381..2f13faa795 100644 --- a/stepmania/src/PlayerOptions.cpp +++ b/stepmania/src/PlayerOptions.cpp @@ -245,7 +245,7 @@ void PlayerOptions::FromString( const RString &sOptions, bool 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) ); } // 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 ) { 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" ); } } diff --git a/stepmania/src/RageSurface_Load.cpp b/stepmania/src/RageSurface_Load.cpp index b37bf8abf8..3d332a90c4 100644 --- a/stepmania/src/RageSurface_Load.cpp +++ b/stepmania/src/RageSurface_Load.cpp @@ -108,7 +108,7 @@ RageSurface *RageSurfaceUtils::LoadFile( const RString &sPath, RString &error, b RageSurface *ret = TryOpenFile( sPath, bHeaderOnly, error, *it, bKeepTrying ); 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; } } diff --git a/stepmania/src/ThemeManager.cpp b/stepmania/src/ThemeManager.cpp index c9e7facdac..baf4a57228 100644 --- a/stepmania/src/ThemeManager.cpp +++ b/stepmania/src/ThemeManager.cpp @@ -757,7 +757,7 @@ try_element_again: ReloadMetrics(); goto try_element_again; case Dialog::ignore: - LOG->UserLog( RageLog::LogType_ThemeElement, sCategory + '/' + sFileName, + LOG->UserLog( "Theme element", sCategory + '/' + sFileName, "could not be found in \"%s\" or \"%s\".", GetThemeDirFromName(m_sCurThemeName).c_str(), GetThemeDirFromName(SpecialFiles::BASE_THEME_NAME).c_str() ); @@ -769,7 +769,7 @@ try_element_again: Cache[sFileName] = GetPath( category, "", "_missing" ); return Cache[sFileName]; case Dialog::abort: - LOG->UserLog( RageLog::LogType_ThemeElement, sCategory + '/' + sFileName, + LOG->UserLog( "Theme element", sCategory + '/' + sFileName, "could not be found in \"%s\" or \"%s\".", GetThemeDirFromName(m_sCurThemeName).c_str(), GetThemeDirFromName(SpecialFiles::BASE_THEME_NAME).c_str() ); @@ -880,7 +880,7 @@ RString ThemeManager::GetMetricRaw( const IniFile &ini, const RString &sClassNam ReloadMetrics(); continue; case Dialog::ignore: - LOG->UserLog( RageLog::LogType_ThemeMetric, sClassName + " : " + sValueName, + LOG->UserLog( "Theme metric", sClassName + " : " + sValueName, "could not be found in \"%s\" or \"%s\".", sCurMetricPath.c_str(), sDefaultMetricPath.c_str() ); return RString();