diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp index 5422c8207e..5f43f4a258 100644 --- a/stepmania/src/GameState.cpp +++ b/stepmania/src/GameState.cpp @@ -297,7 +297,7 @@ void GameState::Reset() void GameState::JoinPlayer( PlayerNumber pn ) { m_bSideIsJoined[pn] = true; - MESSAGEMAN->Broadcast( (Message)(Message_SideJoinedP1+pn) ); + MESSAGEMAN->Broadcast( (MessageID)(Message_SideJoinedP1+pn) ); if( m_MasterPlayerNumber == PLAYER_INVALID ) m_MasterPlayerNumber = pn; @@ -599,7 +599,7 @@ void GameState::Update( float fDelta ) if( !m_bGoalComplete[p] && IsGoalComplete(p) ) { m_bGoalComplete[p] = true; - MESSAGEMAN->Broadcast( (Message)(Message_GoalCompleteP1+p) ); + MESSAGEMAN->Broadcast( (MessageID)(Message_GoalCompleteP1+p) ); } } } @@ -1839,7 +1839,7 @@ public: PlayerNumber pn = Enum::Check(L, 1); if( lua_isnil(L,2) ) { p->m_pCurSteps[pn].Set( NULL ); } else { Steps *pS = Luna::check(L,2); p->m_pCurSteps[pn].Set( pS ); } - MESSAGEMAN->Broadcast( (Message)(Message_CurrentStepsP1Changed+pn) ); + MESSAGEMAN->Broadcast( (MessageID)(Message_CurrentStepsP1Changed+pn) ); return 0; } static int GetCurrentCourse( T* p, lua_State *L ) { if(p->m_pCurCourse) p->m_pCurCourse->PushSelf(L); else lua_pushnil(L); return 1; } @@ -1862,7 +1862,7 @@ public: PlayerNumber pn = Enum::Check(L, 1); if( lua_isnil(L,2) ) { p->m_pCurTrail[pn].Set( NULL ); } else { Trail *pS = Luna::check(L,2); p->m_pCurTrail[pn].Set( pS ); } - MESSAGEMAN->Broadcast( (Message)(Message_CurrentTrailP1Changed+pn) ); + MESSAGEMAN->Broadcast( (MessageID)(Message_CurrentTrailP1Changed+pn) ); return 0; } static int GetPreferredSong( T* p, lua_State *L ) { if(p->m_pPreferredSong) p->m_pPreferredSong->PushSelf(L); else lua_pushnil(L); return 1; } diff --git a/stepmania/src/MemoryCardManager.cpp b/stepmania/src/MemoryCardManager.cpp index eee6c2c358..9ce9e8754b 100644 --- a/stepmania/src/MemoryCardManager.cpp +++ b/stepmania/src/MemoryCardManager.cpp @@ -479,7 +479,7 @@ void MemoryCardManager::CheckStateChanges() if( LastState == MemoryCardState_Ready ) { m_soundDisconnect.Play(); - MESSAGEMAN->Broadcast( (Message)(Message_CardRemovedP1+p) ); + MESSAGEMAN->Broadcast( (MessageID)(Message_CardRemovedP1+p) ); } break; case MemoryCardState_Ready: diff --git a/stepmania/src/MessageManager.cpp b/stepmania/src/MessageManager.cpp index e92c2f1062..e8a44bcc98 100644 --- a/stepmania/src/MessageManager.cpp +++ b/stepmania/src/MessageManager.cpp @@ -12,7 +12,7 @@ MessageManager* MESSAGEMAN = NULL; // global and accessable from anywhere in our program -static const char *MessageNames[] = { +static const char *MessageIDNames[] = { "CurrentGameChanged", "CurrentStyleChanged", "PlayModeChanged", @@ -134,7 +134,7 @@ static const char *MessageNames[] = { "ShowHoldJudgmentMuliPlayerP32", "SongModified", }; -XToString( Message ); +XToString( MessageID ); static RageMutex g_Mutex( "MessageManager" ); @@ -171,7 +171,7 @@ void MessageManager::Subscribe( IMessageSubscriber* pSubscriber, const RString& subs.insert( pSubscriber ); } -void MessageManager::Subscribe( IMessageSubscriber* pSubscriber, Message m ) +void MessageManager::Subscribe( IMessageSubscriber* pSubscriber, MessageID m ) { Subscribe( pSubscriber, MessageToString(m) ); } @@ -186,7 +186,7 @@ void MessageManager::Unsubscribe( IMessageSubscriber* pSubscriber, const RString subs.erase( iter ); } -void MessageManager::Unsubscribe( IMessageSubscriber* pSubscriber, Message m ) +void MessageManager::Unsubscribe( IMessageSubscriber* pSubscriber, MessageID m ) { Unsubscribe( pSubscriber, MessageToString(m) ); } @@ -208,7 +208,7 @@ void MessageManager::Broadcast( const RString& sMessage ) const } } -void MessageManager::Broadcast( Message m ) const +void MessageManager::Broadcast( MessageID m ) const { Broadcast( MessageToString(m) ); } @@ -274,7 +274,7 @@ void MessageSubscriber::SubscribeToMessage( const RString &sMessageName ) m_vsSubscribedTo.push_back( sMessageName ); } -void MessageSubscriber::SubscribeToMessage( Message message ) +void MessageSubscriber::SubscribeToMessage( MessageID message ) { MESSAGEMAN->Subscribe( this, message ); m_vsSubscribedTo.push_back( MessageToString(message) ); diff --git a/stepmania/src/MessageManager.h b/stepmania/src/MessageManager.h index 400f18b3b9..6dc486594b 100644 --- a/stepmania/src/MessageManager.h +++ b/stepmania/src/MessageManager.h @@ -6,7 +6,7 @@ #include "LuaManager.h" struct lua_State; -enum Message +enum MessageID { Message_CurrentGameChanged, Message_CurrentStyleChanged, @@ -128,11 +128,11 @@ enum Message Message_ShowHoldJudgmentMuliPlayerP31, Message_ShowHoldJudgmentMuliPlayerP32, Message_SongModified, - NUM_Message, // leave this at the end - Message_Invalid + NUM_MessageID, // leave this at the end + MessageID_Invalid }; -const RString& MessageToString( Message m ); - +const RString& MessageIDToString( MessageID m ); +#define MessageToString MessageIDToString class IMessageSubscriber { @@ -158,7 +158,7 @@ public: // // Messages // - void SubscribeToMessage( Message message ); // will automatically unsubscribe + void SubscribeToMessage( MessageID message ); // will automatically unsubscribe void SubscribeToMessage( const RString &sMessageName ); // will automatically unsubscribe void UnsubscribeAll(); @@ -175,11 +175,11 @@ public: ~MessageManager(); void Subscribe( IMessageSubscriber* pSubscriber, const RString& sMessage ); - void Subscribe( IMessageSubscriber* pSubscriber, Message m ); + void Subscribe( IMessageSubscriber* pSubscriber, MessageID m ); void Unsubscribe( IMessageSubscriber* pSubscriber, const RString& sMessage ); - void Unsubscribe( IMessageSubscriber* pSubscriber, Message m ); + void Unsubscribe( IMessageSubscriber* pSubscriber, MessageID m ); void Broadcast( const RString& sMessage ) const; - void Broadcast( Message m ) const; + void Broadcast( MessageID m ) const; // Lua void PushSelf( lua_State *L ); @@ -191,11 +191,11 @@ template class BroadcastOnChange { private: - Message mSendWhenChanged; + MessageID mSendWhenChanged; T val; public: - explicit BroadcastOnChange( Message m ) { mSendWhenChanged = m; } + explicit BroadcastOnChange( MessageID m ) { mSendWhenChanged = m; } const T Get() const { return val; } void Set( T t ) { val = t; MESSAGEMAN->Broadcast( MessageToString(mSendWhenChanged) ); } operator T () const { return val; } @@ -212,10 +212,10 @@ private: typedef BroadcastOnChange MyType; vector val; public: - explicit BroadcastOnChange1D( Message m ) + explicit BroadcastOnChange1D( MessageID m ) { for( unsigned i=0; i((Message)(m+i)) ); + val.push_back( BroadcastOnChange((MessageID)(m+i)) ); } const BroadcastOnChange& operator[]( unsigned i ) const { return val[i]; } BroadcastOnChange& operator[]( unsigned i ) { return val[i]; } @@ -225,10 +225,10 @@ template class BroadcastOnChangePtr { private: - Message mSendWhenChanged; + MessageID mSendWhenChanged; T *val; public: - explicit BroadcastOnChangePtr( Message m ) { mSendWhenChanged = m; val = NULL; } + explicit BroadcastOnChangePtr( MessageID m ) { mSendWhenChanged = m; val = NULL; } T* Get() const { return val; } void Set( T* t ) { val = t; if(MESSAGEMAN) MESSAGEMAN->Broadcast( MessageToString(mSendWhenChanged) ); } /* This is only intended to be used for setting temporary values; always @@ -246,10 +246,10 @@ private: typedef BroadcastOnChangePtr MyType; vector val; public: - explicit BroadcastOnChangePtr1D( Message m ) + explicit BroadcastOnChangePtr1D( MessageID m ) { for( unsigned i=0; i((Message)(m+i)) ); + val.push_back( BroadcastOnChangePtr((MessageID)(m+i)) ); } const BroadcastOnChangePtr& operator[]( unsigned i ) const { return val[i]; } BroadcastOnChangePtr& operator[]( unsigned i ) { return val[i]; } diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index fb520ded15..4d0ea7f326 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -2011,7 +2011,7 @@ void ScreenGameplay::SendCrossedMessages() } if( iNumTracksWithTapOrHoldHead > 0 ) - MESSAGEMAN->Broadcast( (Message)(Message_NoteCrossed + i) ); + MESSAGEMAN->Broadcast( (MessageID)(Message_NoteCrossed + i) ); if( i == 0 && iNumTracksWithTapOrHoldHead >= 2 ) { RString sMessageName = "NoteCrossedJump"; diff --git a/stepmania/src/ScreenGameplayLesson.cpp b/stepmania/src/ScreenGameplayLesson.cpp index 0c1a85cb53..9ccb8858e8 100644 --- a/stepmania/src/ScreenGameplayLesson.cpp +++ b/stepmania/src/ScreenGameplayLesson.cpp @@ -116,7 +116,7 @@ void ScreenGameplayLesson::HandleScreenMessage( const ScreenMessage SM ) ResetAndRestartCurrentSong(); m_Try = (Try)(m_Try+1); - MESSAGEMAN->Broadcast( (Message)(Message_LessonTry1+m_Try) ); + MESSAGEMAN->Broadcast( (MessageID)(Message_LessonTry1+m_Try) ); } else { @@ -165,7 +165,7 @@ void ScreenGameplayLesson::ChangeLessonPage( int iDir ) ResetAndRestartCurrentSong(); - MESSAGEMAN->Broadcast( (Message)(Message_LessonTry1+m_Try) ); + MESSAGEMAN->Broadcast( (MessageID)(Message_LessonTry1+m_Try) ); // Change back to the current autoplay setting (in most cases, human controlled). FOREACH_EnabledPlayerInfo( m_vPlayerInfo, pi ) diff --git a/stepmania/src/ScreenSelectMaster.cpp b/stepmania/src/ScreenSelectMaster.cpp index 922640d106..2b420b8deb 100644 --- a/stepmania/src/ScreenSelectMaster.cpp +++ b/stepmania/src/ScreenSelectMaster.cpp @@ -412,8 +412,8 @@ void ScreenSelectMaster::MenuLeft( const InputEventPlus &input ) { m_TrackingRepeatingInput = input.MenuI; m_soundChange.Play(); - MESSAGEMAN->Broadcast( (Message)(Message_MenuLeftP1+pn) ); - MESSAGEMAN->Broadcast( (Message)(Message_MenuSelectionChanged) ); + MESSAGEMAN->Broadcast( (MessageID)(Message_MenuLeftP1+pn) ); + MESSAGEMAN->Broadcast( (MessageID)(Message_MenuSelectionChanged) ); } } @@ -435,8 +435,8 @@ void ScreenSelectMaster::MenuRight( const InputEventPlus &input ) { m_TrackingRepeatingInput = input.MenuI; m_soundChange.Play(); - MESSAGEMAN->Broadcast( (Message)(Message_MenuRightP1+pn) ); - MESSAGEMAN->Broadcast( (Message)(Message_MenuSelectionChanged) ); + MESSAGEMAN->Broadcast( (MessageID)(Message_MenuRightP1+pn) ); + MESSAGEMAN->Broadcast( (MessageID)(Message_MenuSelectionChanged) ); } } @@ -458,8 +458,8 @@ void ScreenSelectMaster::MenuUp( const InputEventPlus &input ) { m_TrackingRepeatingInput = input.MenuI; m_soundChange.Play(); - MESSAGEMAN->Broadcast( (Message)(Message_MenuUpP1+pn) ); - MESSAGEMAN->Broadcast( (Message)(Message_MenuSelectionChanged) ); + MESSAGEMAN->Broadcast( (MessageID)(Message_MenuUpP1+pn) ); + MESSAGEMAN->Broadcast( (MessageID)(Message_MenuSelectionChanged) ); } } @@ -481,8 +481,8 @@ void ScreenSelectMaster::MenuDown( const InputEventPlus &input ) { m_TrackingRepeatingInput = input.MenuI; m_soundChange.Play(); - MESSAGEMAN->Broadcast( (Message)(Message_MenuDownP1+pn) ); - MESSAGEMAN->Broadcast( (Message)(Message_MenuSelectionChanged) ); + MESSAGEMAN->Broadcast( (MessageID)(Message_MenuDownP1+pn) ); + MESSAGEMAN->Broadcast( (MessageID)(Message_MenuSelectionChanged) ); } }