From b1a6f94d69a8bff25a8b68ac09fa344e962e58f0 Mon Sep 17 00:00:00 2001
From: Steve Checkoway <stevecheckoway@users.sourceforge.net>
Date: Sun, 24 Sep 2006 03:56:04 +0000
Subject: [PATCH] This was breaking encapsulation. The api is more or less the
 same. The only purpose for breaking the error message apart like that is it
 allows a consistent look to the messages. (Other files coming soon.)

---
 stepmania/src/RageLog.cpp | 34 +++-------------------------------
 stepmania/src/RageLog.h   | 17 +----------------
 2 files changed, 4 insertions(+), 47 deletions(-)

diff --git a/stepmania/src/RageLog.cpp b/stepmania/src/RageLog.cpp
index ab4d6d26e8..f244cf49ed 100644
--- a/stepmania/src/RageLog.cpp
+++ b/stepmania/src/RageLog.cpp
@@ -227,43 +227,15 @@ void RageLog::Warn( const char *fmt, ... )
 	Write( WRITE_TO_INFO | WRITE_LOUD, sBuff );
 }
 
-static const char *const LogTypeNames[] = {
-	"Song file",
-	"Course file",
-	"Edit file",
-	"Sound file",
-	"Graphic file",
-	"Cache file",
-	"Song",
-	"Theme element",
-	"Theme metric",
-	NULL, // General, not used.
-};
-
-void RageLog::UserLog( LogType lt, const RString &sPath, const char *fmt, ... )
+void RageLog::UserLog( const RString &sType, const RString &sElement, const char *fmt, ... )
 {
 	va_list va;
 	va_start( va, fmt );
 	RString sBuf = vssprintf( fmt, va );
 	va_end( va );
 	
-	switch( lt )
-	{
-	case LogType_SongFile:
-	case LogType_CourseFile:
-	case LogType_EditFile:
-	case LogType_SoundFile:
-	case LogType_GraphicFile:
-	case LogType_CacheFile:
-	case LogType_Song:
-	case LogType_ThemeElement:
-	case LogType_ThemeMetric:
-		sBuf = ssprintf( "%s \"%s\" %s", LogTypeNames[lt], sPath.c_str(), sBuf.c_str() );
-		break;
-	case LogType_General:
-		break;
-	DEFAULT_FAIL( lt );
-	}
+	if( !sType.empty() )
+		sBuf = ssprintf( "%s \"%s\" %s", sType.c_str(), sElement.c_str(), sBuf.c_str() );
 	
 	Write( WRITE_TO_USER_LOG, sBuf );
 }
diff --git a/stepmania/src/RageLog.h b/stepmania/src/RageLog.h
index 9391ca1565..6201ad7ccb 100644
--- a/stepmania/src/RageLog.h
+++ b/stepmania/src/RageLog.h
@@ -9,25 +9,10 @@ public:
 	RageLog();
 	~RageLog();
 	
-	enum LogType
-	{
-		LogType_SongFile,	// Refers to a sm, dwi, ksf, etc. file.
-		LogType_CourseFile,	// Refers to a crs file.
-		LogType_EditFile,	// Refers to an edit file.
-		LogType_SoundFile,	// Refers to a .ogg, .mp3, .wav, etc. file.
-		LogType_GraphicFile,	// Refers to a .jpg, .png, etc. file.
-		LogType_CacheFile,	// Refers to any cache file.
-		LogType_Song,		// Refers to an actual song (directory).
-		LogType_ThemeElement,	// Refers to a theme element.
-		LogType_ThemeMetric,	// Refers to a theme metric.
-		LogType_General,	// Any other type of user log message. Ignores sPath.
-		NUM_LogType
-	};
-
 	void Trace( const char *fmt, ... ) PRINTF(2,3);
 	void Warn( const char *fmt, ... ) PRINTF(2,3);
 	void Info( const char *fmt, ... ) PRINTF(2,3);
-	void UserLog( LogType lt, const RString &sPath, const char *fmt, ... ) PRINTF(4,5);
+	void UserLog( const RString &sType, const RString &sElement, const char *fmt, ... ) PRINTF(4,5);
 	void Flush();
 
 	void MapLog( const RString &key, const char *fmt, ... ) PRINTF(3,4);