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

Message -> MessageID

Browse Source
This commit is contained in:
Glenn Maynard
2006-11-13 22:36:39 +00:00
parent 35fb88e5e5
commit ec061bebc3
7 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/GameState.cpp
+4 -4
View File
@@ -297,7 +297,7 @@ void GameState::Reset()
void GameState::JoinPlayer( PlayerNumber pn ) void GameState::JoinPlayer( PlayerNumber pn )
{ {
m_bSideIsJoined[pn] = true; m_bSideIsJoined[pn] = true;
MESSAGEMAN->Broadcast( (Message)(Message_SideJoinedP1+pn) ); MESSAGEMAN->Broadcast( (MessageID)(Message_SideJoinedP1+pn) );
if( m_MasterPlayerNumber == PLAYER_INVALID ) if( m_MasterPlayerNumber == PLAYER_INVALID )
m_MasterPlayerNumber = pn; m_MasterPlayerNumber = pn;
@@ -599,7 +599,7 @@ void GameState::Update( float fDelta )
if( !m_bGoalComplete[p] && IsGoalComplete(p) ) if( !m_bGoalComplete[p] && IsGoalComplete(p) )
{ {
m_bGoalComplete[p] = true; 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<PlayerNumber>(L, 1); PlayerNumber pn = Enum::Check<PlayerNumber>(L, 1);
if( lua_isnil(L,2) ) { p->m_pCurSteps[pn].Set( NULL ); } if( lua_isnil(L,2) ) { p->m_pCurSteps[pn].Set( NULL ); }
else { Steps *pS = Luna<Steps>::check(L,2); p->m_pCurSteps[pn].Set( pS ); } else { Steps *pS = Luna<Steps>::check(L,2); p->m_pCurSteps[pn].Set( pS ); }
MESSAGEMAN->Broadcast( (Message)(Message_CurrentStepsP1Changed+pn) ); MESSAGEMAN->Broadcast( (MessageID)(Message_CurrentStepsP1Changed+pn) );
return 0; 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; } 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<PlayerNumber>(L, 1); PlayerNumber pn = Enum::Check<PlayerNumber>(L, 1);
if( lua_isnil(L,2) ) { p->m_pCurTrail[pn].Set( NULL ); } if( lua_isnil(L,2) ) { p->m_pCurTrail[pn].Set( NULL ); }
else { Trail *pS = Luna<Trail>::check(L,2); p->m_pCurTrail[pn].Set( pS ); } else { Trail *pS = Luna<Trail>::check(L,2); p->m_pCurTrail[pn].Set( pS ); }
MESSAGEMAN->Broadcast( (Message)(Message_CurrentTrailP1Changed+pn) ); MESSAGEMAN->Broadcast( (MessageID)(Message_CurrentTrailP1Changed+pn) );
return 0; 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; } static int GetPreferredSong( T* p, lua_State *L ) { if(p->m_pPreferredSong) p->m_pPreferredSong->PushSelf(L); else lua_pushnil(L); return 1; }
stepmania/src/MemoryCardManager.cpp
+1 -1
View File
@@ -479,7 +479,7 @@ void MemoryCardManager::CheckStateChanges()
if( LastState == MemoryCardState_Ready ) if( LastState == MemoryCardState_Ready )
{ {
m_soundDisconnect.Play(); m_soundDisconnect.Play();
MESSAGEMAN->Broadcast( (Message)(Message_CardRemovedP1+p) ); MESSAGEMAN->Broadcast( (MessageID)(Message_CardRemovedP1+p) );
} }
break; break;
case MemoryCardState_Ready: case MemoryCardState_Ready:
stepmania/src/MessageManager.cpp
+6 -6
View File
@@ -12,7 +12,7 @@
MessageManager* MESSAGEMAN = NULL; // global and accessable from anywhere in our program MessageManager* MESSAGEMAN = NULL; // global and accessable from anywhere in our program
static const char *MessageNames[] = { static const char *MessageIDNames[] = {
"CurrentGameChanged", "CurrentGameChanged",
"CurrentStyleChanged", "CurrentStyleChanged",
"PlayModeChanged", "PlayModeChanged",
@@ -134,7 +134,7 @@ static const char *MessageNames[] = {
"ShowHoldJudgmentMuliPlayerP32", "ShowHoldJudgmentMuliPlayerP32",
"SongModified", "SongModified",
}; };
XToString( Message ); XToString( MessageID );
static RageMutex g_Mutex( "MessageManager" ); static RageMutex g_Mutex( "MessageManager" );
@@ -171,7 +171,7 @@ void MessageManager::Subscribe( IMessageSubscriber* pSubscriber, const RString&
subs.insert( pSubscriber ); subs.insert( pSubscriber );
} }
void MessageManager::Subscribe( IMessageSubscriber* pSubscriber, Message m ) void MessageManager::Subscribe( IMessageSubscriber* pSubscriber, MessageID m )
{ {
Subscribe( pSubscriber, MessageToString(m) ); Subscribe( pSubscriber, MessageToString(m) );
} }
@@ -186,7 +186,7 @@ void MessageManager::Unsubscribe( IMessageSubscriber* pSubscriber, const RString
subs.erase( iter ); subs.erase( iter );
} }
void MessageManager::Unsubscribe( IMessageSubscriber* pSubscriber, Message m ) void MessageManager::Unsubscribe( IMessageSubscriber* pSubscriber, MessageID m )
{ {
Unsubscribe( pSubscriber, MessageToString(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) ); Broadcast( MessageToString(m) );
} }
@@ -274,7 +274,7 @@ void MessageSubscriber::SubscribeToMessage( const RString &sMessageName )
m_vsSubscribedTo.push_back( sMessageName ); m_vsSubscribedTo.push_back( sMessageName );
} }
void MessageSubscriber::SubscribeToMessage( Message message ) void MessageSubscriber::SubscribeToMessage( MessageID message )
{ {
MESSAGEMAN->Subscribe( this, message ); MESSAGEMAN->Subscribe( this, message );
m_vsSubscribedTo.push_back( MessageToString(message) ); m_vsSubscribedTo.push_back( MessageToString(message) );
stepmania/src/MessageManager.h
+17 -17
View File
@@ -6,7 +6,7 @@
#include "LuaManager.h" #include "LuaManager.h"
struct lua_State; struct lua_State;
enum Message enum MessageID
{ {
Message_CurrentGameChanged, Message_CurrentGameChanged,
Message_CurrentStyleChanged, Message_CurrentStyleChanged,
@@ -128,11 +128,11 @@ enum Message
Message_ShowHoldJudgmentMuliPlayerP31, Message_ShowHoldJudgmentMuliPlayerP31,
Message_ShowHoldJudgmentMuliPlayerP32, Message_ShowHoldJudgmentMuliPlayerP32,
Message_SongModified, Message_SongModified,
NUM_Message, // leave this at the end NUM_MessageID, // leave this at the end
Message_Invalid MessageID_Invalid
}; };
const RString& MessageToString( Message m ); const RString& MessageIDToString( MessageID m );
#define MessageToString MessageIDToString
class IMessageSubscriber class IMessageSubscriber
{ {
@@ -158,7 +158,7 @@ public:
// //
// Messages // Messages
// //
void SubscribeToMessage( Message message ); // will automatically unsubscribe void SubscribeToMessage( MessageID message ); // will automatically unsubscribe
void SubscribeToMessage( const RString &sMessageName ); // will automatically unsubscribe void SubscribeToMessage( const RString &sMessageName ); // will automatically unsubscribe
void UnsubscribeAll(); void UnsubscribeAll();
@@ -175,11 +175,11 @@ public:
~MessageManager(); ~MessageManager();
void Subscribe( IMessageSubscriber* pSubscriber, const RString& sMessage ); 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, const RString& sMessage );
void Unsubscribe( IMessageSubscriber* pSubscriber, Message m ); void Unsubscribe( IMessageSubscriber* pSubscriber, MessageID m );
void Broadcast( const RString& sMessage ) const; void Broadcast( const RString& sMessage ) const;
void Broadcast( Message m ) const; void Broadcast( MessageID m ) const;
// Lua // Lua
void PushSelf( lua_State *L ); void PushSelf( lua_State *L );
@@ -191,11 +191,11 @@ template<class T>
class BroadcastOnChange class BroadcastOnChange
{ {
private: private:
Message mSendWhenChanged; MessageID mSendWhenChanged;
T val; T val;
public: public:
explicit BroadcastOnChange( Message 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( MessageToString(mSendWhenChanged) ); }
operator T () const { return val; } operator T () const { return val; }
@@ -212,10 +212,10 @@ private:
typedef BroadcastOnChange<T> MyType; typedef BroadcastOnChange<T> MyType;
vector<MyType> val; vector<MyType> val;
public: public:
explicit BroadcastOnChange1D( Message m ) explicit BroadcastOnChange1D( MessageID m )
{ {
for( unsigned i=0; i<N; i++ ) for( unsigned i=0; i<N; i++ )
val.push_back( BroadcastOnChange<T>((Message)(m+i)) ); val.push_back( BroadcastOnChange<T>((MessageID)(m+i)) );
} }
const BroadcastOnChange<T>& operator[]( unsigned i ) const { return val[i]; } const BroadcastOnChange<T>& operator[]( unsigned i ) const { return val[i]; }
BroadcastOnChange<T>& operator[]( unsigned i ) { return val[i]; } BroadcastOnChange<T>& operator[]( unsigned i ) { return val[i]; }
@@ -225,10 +225,10 @@ template<class T>
class BroadcastOnChangePtr class BroadcastOnChangePtr
{ {
private: private:
Message mSendWhenChanged; MessageID mSendWhenChanged;
T *val; T *val;
public: public:
explicit BroadcastOnChangePtr( Message 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( MessageToString(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
@@ -246,10 +246,10 @@ private:
typedef BroadcastOnChangePtr<T> MyType; typedef BroadcastOnChangePtr<T> MyType;
vector<MyType> val; vector<MyType> val;
public: public:
explicit BroadcastOnChangePtr1D( Message m ) explicit BroadcastOnChangePtr1D( MessageID m )
{ {
for( unsigned i=0; i<N; i++ ) for( unsigned i=0; i<N; i++ )
val.push_back( BroadcastOnChangePtr<T>((Message)(m+i)) ); val.push_back( BroadcastOnChangePtr<T>((MessageID)(m+i)) );
} }
const BroadcastOnChangePtr<T>& operator[]( unsigned i ) const { return val[i]; } const BroadcastOnChangePtr<T>& operator[]( unsigned i ) const { return val[i]; }
BroadcastOnChangePtr<T>& operator[]( unsigned i ) { return val[i]; } BroadcastOnChangePtr<T>& operator[]( unsigned i ) { return val[i]; }
stepmania/src/ScreenGameplay.cpp
+1 -1
View File
@@ -2011,7 +2011,7 @@ void ScreenGameplay::SendCrossedMessages()
} }
if( iNumTracksWithTapOrHoldHead > 0 ) if( iNumTracksWithTapOrHoldHead > 0 )
MESSAGEMAN->Broadcast( (Message)(Message_NoteCrossed + i) ); MESSAGEMAN->Broadcast( (MessageID)(Message_NoteCrossed + i) );
if( i == 0 && iNumTracksWithTapOrHoldHead >= 2 ) if( i == 0 && iNumTracksWithTapOrHoldHead >= 2 )
{ {
RString sMessageName = "NoteCrossedJump"; RString sMessageName = "NoteCrossedJump";
stepmania/src/ScreenGameplayLesson.cpp
+2 -2
View File
@@ -116,7 +116,7 @@ void ScreenGameplayLesson::HandleScreenMessage( const ScreenMessage SM )
ResetAndRestartCurrentSong(); ResetAndRestartCurrentSong();
m_Try = (Try)(m_Try+1); m_Try = (Try)(m_Try+1);
MESSAGEMAN->Broadcast( (Message)(Message_LessonTry1+m_Try) ); MESSAGEMAN->Broadcast( (MessageID)(Message_LessonTry1+m_Try) );
} }
else else
{ {
@@ -165,7 +165,7 @@ void ScreenGameplayLesson::ChangeLessonPage( int iDir )
ResetAndRestartCurrentSong(); 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). // Change back to the current autoplay setting (in most cases, human controlled).
FOREACH_EnabledPlayerInfo( m_vPlayerInfo, pi ) FOREACH_EnabledPlayerInfo( m_vPlayerInfo, pi )
stepmania/src/ScreenSelectMaster.cpp
+8 -8
View File
@@ -412,8 +412,8 @@ void ScreenSelectMaster::MenuLeft( const InputEventPlus &input )
{ {
m_TrackingRepeatingInput = input.MenuI; m_TrackingRepeatingInput = input.MenuI;
m_soundChange.Play(); m_soundChange.Play();
MESSAGEMAN->Broadcast( (Message)(Message_MenuLeftP1+pn) ); MESSAGEMAN->Broadcast( (MessageID)(Message_MenuLeftP1+pn) );
MESSAGEMAN->Broadcast( (Message)(Message_MenuSelectionChanged) ); MESSAGEMAN->Broadcast( (MessageID)(Message_MenuSelectionChanged) );
} }
} }
@@ -435,8 +435,8 @@ void ScreenSelectMaster::MenuRight( const InputEventPlus &input )
{ {
m_TrackingRepeatingInput = input.MenuI; m_TrackingRepeatingInput = input.MenuI;
m_soundChange.Play(); m_soundChange.Play();
MESSAGEMAN->Broadcast( (Message)(Message_MenuRightP1+pn) ); MESSAGEMAN->Broadcast( (MessageID)(Message_MenuRightP1+pn) );
MESSAGEMAN->Broadcast( (Message)(Message_MenuSelectionChanged) ); MESSAGEMAN->Broadcast( (MessageID)(Message_MenuSelectionChanged) );
} }
} }
@@ -458,8 +458,8 @@ void ScreenSelectMaster::MenuUp( const InputEventPlus &input )
{ {
m_TrackingRepeatingInput = input.MenuI; m_TrackingRepeatingInput = input.MenuI;
m_soundChange.Play(); m_soundChange.Play();
MESSAGEMAN->Broadcast( (Message)(Message_MenuUpP1+pn) ); MESSAGEMAN->Broadcast( (MessageID)(Message_MenuUpP1+pn) );
MESSAGEMAN->Broadcast( (Message)(Message_MenuSelectionChanged) ); MESSAGEMAN->Broadcast( (MessageID)(Message_MenuSelectionChanged) );
} }
} }
@@ -481,8 +481,8 @@ void ScreenSelectMaster::MenuDown( const InputEventPlus &input )
{ {
m_TrackingRepeatingInput = input.MenuI; m_TrackingRepeatingInput = input.MenuI;
m_soundChange.Play(); m_soundChange.Play();
MESSAGEMAN->Broadcast( (Message)(Message_MenuDownP1+pn) ); MESSAGEMAN->Broadcast( (MessageID)(Message_MenuDownP1+pn) );
MESSAGEMAN->Broadcast( (Message)(Message_MenuSelectionChanged) ); MESSAGEMAN->Broadcast( (MessageID)(Message_MenuSelectionChanged) );
} }
} }