actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

MessageToString -> MessageIDToString

Browse Source
This commit is contained in:
Glenn Maynard
2006-11-14 04:26:38 +00:00
parent 174f0c16fa
commit c86c218522
4 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/MessageManager.cpp
+4 -4
View File
@@ -199,7 +199,7 @@ void MessageManager::Subscribe( IMessageSubscriber* pSubscriber, const RString&
void MessageManager::Subscribe( IMessageSubscriber* pSubscriber, MessageID m ) void MessageManager::Subscribe( IMessageSubscriber* pSubscriber, MessageID m )
{ {
Subscribe( pSubscriber, MessageToString(m) ); Subscribe( pSubscriber, MessageIDToString(m) );
} }
void MessageManager::Unsubscribe( IMessageSubscriber* pSubscriber, const RString& sMessage ) void MessageManager::Unsubscribe( IMessageSubscriber* pSubscriber, const RString& sMessage )
@@ -214,7 +214,7 @@ void MessageManager::Unsubscribe( IMessageSubscriber* pSubscriber, const RString
void MessageManager::Unsubscribe( IMessageSubscriber* pSubscriber, MessageID m ) void MessageManager::Unsubscribe( IMessageSubscriber* pSubscriber, MessageID m )
{ {
Unsubscribe( pSubscriber, MessageToString(m) ); Unsubscribe( pSubscriber, MessageIDToString(m) );
} }
void MessageManager::Broadcast( const Message &msg ) const void MessageManager::Broadcast( const Message &msg ) const
@@ -240,7 +240,7 @@ void MessageManager::Broadcast( const RString& sMessage ) const
void MessageManager::Broadcast( MessageID m ) const void MessageManager::Broadcast( MessageID m ) const
{ {
Broadcast( MessageToString(m) ); Broadcast( MessageIDToString(m) );
} }
void IMessageSubscriber::ClearMessages( const RString sMessage ) void IMessageSubscriber::ClearMessages( const RString sMessage )
@@ -267,7 +267,7 @@ void MessageSubscriber::SubscribeToMessage( const RString &sMessageName )
void MessageSubscriber::SubscribeToMessage( MessageID message ) void MessageSubscriber::SubscribeToMessage( MessageID message )
{ {
MESSAGEMAN->Subscribe( this, message ); MESSAGEMAN->Subscribe( this, message );
m_vsSubscribedTo.push_back( MessageToString(message) ); m_vsSubscribedTo.push_back( MessageIDToString(message) );
} }
void MessageSubscriber::UnsubscribeAll() void MessageSubscriber::UnsubscribeAll()
stepmania/src/MessageManager.h
+2 -3
View File
@@ -134,7 +134,6 @@ enum MessageID
MessageID_Invalid MessageID_Invalid
}; };
const RString& MessageIDToString( MessageID m ); const RString& MessageIDToString( MessageID m );
#define MessageToString MessageIDToString
struct Message struct Message
{ {
@@ -225,7 +224,7 @@ private:
public: public:
explicit BroadcastOnChange( MessageID m ) { mSendWhenChanged = m; } explicit BroadcastOnChange( MessageID m ) { mSendWhenChanged = m; }
const T Get() const { return val; } const T Get() const { return val; }
void Set( T t ) { val = t; MESSAGEMAN->Broadcast( MessageToString(mSendWhenChanged) ); } void Set( T t ) { val = t; MESSAGEMAN->Broadcast( MessageIDToString(mSendWhenChanged) ); }
operator T () const { return val; } operator T () const { return val; }
bool operator == ( const T &other ) const { return val == other; } bool operator == ( const T &other ) const { return val == other; }
bool operator != ( const T &other ) const { return val != other; } bool operator != ( const T &other ) const { return val != other; }
@@ -258,7 +257,7 @@ private:
public: public:
explicit BroadcastOnChangePtr( MessageID m ) { mSendWhenChanged = m; val = NULL; } explicit BroadcastOnChangePtr( MessageID m ) { mSendWhenChanged = m; val = NULL; }
T* Get() const { return val; } T* Get() const { return val; }
void Set( T* t ) { val = t; if(MESSAGEMAN) MESSAGEMAN->Broadcast( MessageToString(mSendWhenChanged) ); } void Set( T* t ) { val = t; if(MESSAGEMAN) MESSAGEMAN->Broadcast( MessageIDToString(mSendWhenChanged) ); }
/* This is only intended to be used for setting temporary values; always /* This is only intended to be used for setting temporary values; always
* restore the original value when finished, so listeners don't get confused * restore the original value when finished, so listeners don't get confused
* due to missing a message. */ * due to missing a message. */
stepmania/src/OptionRowHandler.cpp
+5 -5
View File
@@ -453,13 +453,13 @@ public:
m_ppStepsToFill = &GAMESTATE->m_pCurSteps[0]; m_ppStepsToFill = &GAMESTATE->m_pCurSteps[0];
m_pDifficultyToFill = &GAMESTATE->m_PreferredDifficulty[0]; m_pDifficultyToFill = &GAMESTATE->m_PreferredDifficulty[0];
m_pst = &GAMESTATE->m_stEdit; m_pst = &GAMESTATE->m_stEdit;
m_vsReloadRowMessages.push_back( MessageToString(Message_EditStepsTypeChanged) ); m_vsReloadRowMessages.push_back( MessageIDToString(Message_EditStepsTypeChanged) );
} }
else if( sParam == "EditSourceSteps" ) else if( sParam == "EditSourceSteps" )
{ {
m_ppStepsToFill = &GAMESTATE->m_pEditSourceSteps; m_ppStepsToFill = &GAMESTATE->m_pEditSourceSteps;
m_pst = &GAMESTATE->m_stEditSource; m_pst = &GAMESTATE->m_stEditSource;
m_vsReloadRowMessages.push_back( MessageToString(Message_EditSourceStepsTypeChanged) ); m_vsReloadRowMessages.push_back( MessageIDToString(Message_EditSourceStepsTypeChanged) );
if( GAMESTATE->m_pCurSteps[0].Get() != NULL ) if( GAMESTATE->m_pCurSteps[0].Get() != NULL )
m_Def.m_vEnabledForPlayers.clear(); // hide row m_Def.m_vEnabledForPlayers.clear(); // hide row
} }
@@ -473,7 +473,7 @@ public:
m_Def.m_layoutType = LAYOUT_SHOW_ONE_IN_ROW; m_Def.m_layoutType = LAYOUT_SHOW_ONE_IN_ROW;
m_Def.m_bExportOnChange = true; m_Def.m_bExportOnChange = true;
m_Def.m_bAllowThemeItems = false; // we theme the text ourself m_Def.m_bAllowThemeItems = false; // we theme the text ourself
m_vsReloadRowMessages.push_back( MessageToString(Message_CurrentSongChanged) ); m_vsReloadRowMessages.push_back( MessageIDToString(Message_CurrentSongChanged) );
m_vDifficulties.clear(); m_vDifficulties.clear();
m_vSteps.clear(); m_vSteps.clear();
@@ -1134,8 +1134,8 @@ public:
else if( sParam == "EditSourceStepsType" ) else if( sParam == "EditSourceStepsType" )
{ {
m_pstToFill = &GAMESTATE->m_stEditSource; m_pstToFill = &GAMESTATE->m_stEditSource;
m_vsReloadRowMessages.push_back( MessageToString(Message_CurrentStepsP1Changed) ); m_vsReloadRowMessages.push_back( MessageIDToString(Message_CurrentStepsP1Changed) );
m_vsReloadRowMessages.push_back( MessageToString(Message_EditStepsTypeChanged) ); m_vsReloadRowMessages.push_back( MessageIDToString(Message_EditStepsTypeChanged) );
if( GAMESTATE->m_pCurSteps[0].Get() != NULL ) if( GAMESTATE->m_pCurSteps[0].Get() != NULL )
m_Def.m_vEnabledForPlayers.clear(); // hide row m_Def.m_vEnabledForPlayers.clear(); // hide row
} }
stepmania/src/ScreenUnlockBrowse.cpp
+1 -1
View File
@@ -43,7 +43,7 @@ void ScreenUnlockBrowse::BeginScreen()
{ {
ScreenSelectMaster::BeginScreen(); ScreenSelectMaster::BeginScreen();
HandleMessage( Message(MessageToString(Message_MenuSelectionChanged)) ); HandleMessage( Message(MessageIDToString(Message_MenuSelectionChanged)) );
} }
void ScreenUnlockBrowse::MenuStart( const InputEventPlus &input ) void ScreenUnlockBrowse::MenuStart( const InputEventPlus &input )