From f36f6618fa5b6317765899175b85cae8887837f0 Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Mon, 21 Jul 2008 12:00:50 +0000
Subject: [PATCH] use RString for ScreenMessage for easier debugging

---
 stepmania/src/Screen.cpp        |  2 +-
 stepmania/src/ScreenMessage.cpp |  8 ++++----
 stepmania/src/ScreenMessage.h   | 14 +++++++-------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/stepmania/src/Screen.cpp b/stepmania/src/Screen.cpp
index 46df9cd91c..61d7106df2 100644
--- a/stepmania/src/Screen.cpp
+++ b/stepmania/src/Screen.cpp
@@ -275,7 +275,7 @@ public:
 	static int PostScreenMessage( T* p, lua_State *L )
 	{
 		RString sMessage = SArg(1);
-		ScreenMessage SM = ScreenMessageHelpers::ToMessageNumber( sMessage );
+		ScreenMessage SM = ScreenMessageHelpers::ToScreenMessage( sMessage );
 		p->PostScreenMessage( SM, 0 );
 		return 0;
 	}
diff --git a/stepmania/src/ScreenMessage.cpp b/stepmania/src/ScreenMessage.cpp
index 844d978f21..572f177055 100644
--- a/stepmania/src/ScreenMessage.cpp
+++ b/stepmania/src/ScreenMessage.cpp
@@ -4,7 +4,7 @@
 #include "Foreach.h"
 #include <map>
 
-const ScreenMessage SM_Invalid = 999999;
+const ScreenMessage SM_Invalid = "";
 AutoScreenMessage(SM_None);
 AutoScreenMessage(SM_MenuTimer);
 AutoScreenMessage(SM_DoneFadingIn);
@@ -19,18 +19,18 @@ AutoScreenMessage(SM_Failure);
 
 static map<RString, ScreenMessage> *m_pScreenMessages;
 
-ScreenMessage ScreenMessageHelpers::ToMessageNumber( const RString &sName )
+ScreenMessage ScreenMessageHelpers::ToScreenMessage( const RString &sName )
 {
 	if( m_pScreenMessages == NULL )
 		m_pScreenMessages = new map<RString, ScreenMessage>;
 
 	if( m_pScreenMessages->find( sName ) == m_pScreenMessages->end() )
-		(*m_pScreenMessages)[sName] = (ScreenMessage) m_pScreenMessages->size();
+		(*m_pScreenMessages)[sName] = (ScreenMessage)sName;
 
 	return (*m_pScreenMessages)[sName];
 }
 
-RString	ScreenMessageHelpers::NumberToString( ScreenMessage SM )
+RString	ScreenMessageHelpers::ScreenMessageToString( ScreenMessage SM )
 {
 	FOREACHM( RString, ScreenMessage, *m_pScreenMessages, it )
 		if( SM == it->second )
diff --git a/stepmania/src/ScreenMessage.h b/stepmania/src/ScreenMessage.h
index ed13c1a70e..22e18caf4b 100644
--- a/stepmania/src/ScreenMessage.h
+++ b/stepmania/src/ScreenMessage.h
@@ -1,9 +1,9 @@
-/* ScreenMessage - Definition of common ScreenMessages. */
+/* ScreenMessage - Definition of common ScreenMessages and helpers. */
 
-#ifndef SCREEN_MESSAGE_H
-#define SCREEN_MESSAGE_H
+#ifndef ScreenMessage_H
+#define ScreenMessage_H
 
-typedef int ScreenMessage;
+typedef RString ScreenMessage;
 
 extern const ScreenMessage SM_Invalid;
 extern const ScreenMessage SM_None;
@@ -20,13 +20,13 @@ extern const ScreenMessage SM_Failure;
 
 namespace ScreenMessageHelpers
 {
-	ScreenMessage ToMessageNumber( const RString & Name );
-	RString	NumberToString( ScreenMessage SM );
+	ScreenMessage ToScreenMessage( const RString & Name );
+	RString	ScreenMessageToString( ScreenMessage SM );
 };
 
 // Automatically generate a unique ScreenMessage value
 #define AutoScreenMessage( x ) \
-	const ScreenMessage x = ScreenMessageHelpers::ToMessageNumber( #x );
+	const ScreenMessage x = ScreenMessageHelpers::ToScreenMessage( #x );
 
 
 #endif