From 617cc32566578d3b4bcf8ea302f9cce39f07652f Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Fri, 24 Feb 2006 01:03:18 +0000
Subject: [PATCH] eliminate remaining special-cased messages

---
 stepmania/src/ScreenMessage.cpp | 15 ++++++++++++++-
 stepmania/src/ScreenMessage.h   | 33 +++++++++++++++------------------
 2 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/stepmania/src/ScreenMessage.cpp b/stepmania/src/ScreenMessage.cpp
index f9245d8f20..c8b2c976df 100644
--- a/stepmania/src/ScreenMessage.cpp
+++ b/stepmania/src/ScreenMessage.cpp
@@ -3,6 +3,19 @@
 #include "RageLog.h"
 #include "Foreach.h"
 
+const ScreenMessage SM_Invalid = 999999;
+AutoScreenMessage(SM_None);
+AutoScreenMessage(SM_MenuTimer);
+AutoScreenMessage(SM_DoneFadingIn);
+AutoScreenMessage(SM_BeginFadingOut);
+AutoScreenMessage(SM_GoToNextScreen);
+AutoScreenMessage(SM_GoToPrevScreen);
+AutoScreenMessage(SM_GainFocus);
+AutoScreenMessage(SM_LoseFocus);
+AutoScreenMessage(SM_Pause);
+AutoScreenMessage(SM_Success);
+AutoScreenMessage(SM_Failure);
+
 ASMHClass AutoScreenMessageHandler;
 
 ScreenMessage ASMHClass::ToMessageNumber( const RString &sName )
@@ -10,7 +23,7 @@ ScreenMessage ASMHClass::ToMessageNumber( const RString &sName )
 	if( m_pScreenMessages == NULL )
 	{
 		m_pScreenMessages = new map<RString, ScreenMessage>;
-		m_iCurScreenMessage = SM_User;
+		m_iCurScreenMessage = (ScreenMessage) 0;
 	}
 
 	if( m_pScreenMessages->find( sName ) == m_pScreenMessages->end() )
diff --git a/stepmania/src/ScreenMessage.h b/stepmania/src/ScreenMessage.h
index 14de019a7b..9bba5c383c 100644
--- a/stepmania/src/ScreenMessage.h
+++ b/stepmania/src/ScreenMessage.h
@@ -1,27 +1,24 @@
 /* ScreenMessage - Definition of common ScreenMessages. */
 
-#ifndef SCREENMESSAGE_H
-#define SCREENMESSAGE_H
+#ifndef SCREEN_MESSAGE_H
+#define SCREEN_MESSAGE_H
 
 #include <map>
 
-enum ScreenMessage {
-	SM_None = 0,
-	SM_MenuTimer,
-	SM_DoneFadingIn,
-	SM_BeginFadingOut,
-	SM_GoToNextScreen,
-	SM_GoToPrevScreen,
-	SM_GainFocus,
-	SM_LoseFocus,
-	SM_Pause,
-	SM_Success,
-	SM_Failure,
+typedef int ScreenMessage;
 
-	SM_User,
-
-	SM_Invalid = 999999
-};
+extern const ScreenMessage SM_Invalid;
+extern const ScreenMessage SM_None;
+extern const ScreenMessage SM_MenuTimer;
+extern const ScreenMessage SM_DoneFadingIn;
+extern const ScreenMessage SM_BeginFadingOut;
+extern const ScreenMessage SM_GoToNextScreen;
+extern const ScreenMessage SM_GoToPrevScreen;
+extern const ScreenMessage SM_GainFocus;
+extern const ScreenMessage SM_LoseFocus;
+extern const ScreenMessage SM_Pause;
+extern const ScreenMessage SM_Success;
+extern const ScreenMessage SM_Failure;
 
 class ASMHClass
 {