eliminate remaining special-cased messages

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() )

stepmania/src/ScreenMessage.h

@@ -1,27 +1,24 @@
 /* ScreenMessage - Definition of common ScreenMessages. */
 
-#ifndef SCREENMESSAGE_H
+#ifndef SCREEN_MESSAGE_H
-#define SCREENMESSAGE_H
+#define SCREEN_MESSAGE_H
 
 #include <map>
 
-enum ScreenMessage {
+typedef int ScreenMessage;
-	SM_None = 0,
-	SM_MenuTimer,
-	SM_DoneFadingIn,
-	SM_BeginFadingOut,
-	SM_GoToNextScreen,
-	SM_GoToPrevScreen,
-	SM_GainFocus,
-	SM_LoseFocus,
-	SM_Pause,
-	SM_Success,
-	SM_Failure,
 
-	SM_User,
+extern const ScreenMessage SM_Invalid;
-
+extern const ScreenMessage SM_None;
-	SM_Invalid = 999999
+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
 {