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

clean up enum Message names so that they match the corresponding strings

Browse Source
This commit is contained in:
Chris Danford
2005-08-14 07:29:48 +00:00
parent 09386e06e3
commit 7191258c0a
13 changed files with 92 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Combo.cpp
+1 -1
View File
@@ -13,7 +13,7 @@ Combo::Combo()
m_pPlayerState = NULL;
m_pPlayerStageStats = NULL;
this->SubscribeToMessage( MESSAGE_BEAT_CROSSED );
this->SubscribeToMessage( Message_BeatCrossed );
}
void Combo::Load( PlayerState *pPlayerState, PlayerStageStats *pPlayerStageStats )
stepmania/src/GameState.cpp
+18 -18
View File
@@ -66,20 +66,20 @@ Song* GameState::GetDefaultSong() const
GameState::GameState() :
m_pCurStyle( MESSAGE_CURRENT_STYLE_CHANGED ),
m_PlayMode( MESSAGE_PLAY_MODE_CHANGED ),
m_sPreferredSongGroup( MESSAGE_PREFERRED_SONG_GROUP_CHANGED ),
m_sPreferredCourseGroup(MESSAGE_PREFERRED_COURSE_GROUP_CHANGED ),
m_PreferredCourseDifficulty( MESSAGE_EDIT_PREFERRED_COURSE_DIFFICULTY_P1_CHANGED ),
m_PreferredDifficulty( MESSAGE_EDIT_PREFERRED_DIFFICULTY_P1_CHANGED ),
m_pCurSong( MESSAGE_CURRENT_SONG_CHANGED ),
m_pCurSteps( MESSAGE_CURRENT_STEPS_P1_CHANGED ),
m_pCurCourse( MESSAGE_CURRENT_COURSE_CHANGED ),
m_pCurTrail( MESSAGE_CURRENT_TRAIL_P1_CHANGED ),
m_stEdit( MESSAGE_EDIT_STEPS_TYPE_CHANGED ),
m_pEditSourceSteps( MESSAGE_EDIT_SOURCE_STEPS_CHANGED ),
m_stEditSource( MESSAGE_EDIT_SOURCE_STEPS_TYPE_CHANGED ),
m_iEditCourseEntryIndex(MESSAGE_EDIT_COURSE_ENTRY_INDEX_CHANGED ),
m_pCurStyle( Message_CurrentStyleChanged ),
m_PlayMode( Message_PlayModeChanged ),
m_sPreferredSongGroup( Message_PreferredSongGroupChanged ),
m_sPreferredCourseGroup(Message_PreferredCourseGroupChanged ),
m_PreferredCourseDifficulty( Message_PreferredCourseDifficultyP1Changed ),
m_PreferredDifficulty( Message_PreferredDifficultyP1Changed ),
m_pCurSong( Message_CurrentSongChanged ),
m_pCurSteps( Message_CurrentStepsP1Changed ),
m_pCurCourse( Message_CurrentCourseChanged ),
m_pCurTrail( Message_CurrentTrailP1Changed ),
m_stEdit( Message_EditStepsTypeChanged ),
m_pEditSourceSteps( Message_EditSourceStepsChanged ),
m_stEditSource( Message_EditSourceStepsTypeChanged ),
m_iEditCourseEntryIndex(Message_EditCourseEntryIndexChanged ),
m_sEditLocalProfileID( Message_EditLocalProfileIDChanged )
{
m_pCurStyle.Set( NULL );
@@ -269,7 +269,7 @@ void GameState::Reset()
void GameState::JoinPlayer( PlayerNumber pn )
{
this->m_bSideIsJoined[pn] = true;
MESSAGEMAN->Broadcast( (Message)(MESSAGE_SIDE_JOINED_P1+pn) );
MESSAGEMAN->Broadcast( (Message)(Message_SideJoinedP1+pn) );
if( this->m_MasterPlayerNumber == PLAYER_INVALID )
this->m_MasterPlayerNumber = pn;
@@ -334,7 +334,7 @@ void GameState::PlayersFinalized()
if( MEMCARDMAN->GetCardsLocked() )
return;
MESSAGEMAN->Broadcast( MESSAGE_PLAYERS_FINALIZED );
MESSAGEMAN->Broadcast( Message_PlayersFinalized );
MEMCARDMAN->LockCards();
@@ -564,7 +564,7 @@ void GameState::Update( float fDelta )
if( !m_bGoalComplete[p] && IsGoalComplete(p) )
{
m_bGoalComplete[p] = true;
MESSAGEMAN->Broadcast( (Message)(MESSAGE_GOAL_COMPLETE_P1+p) );
MESSAGEMAN->Broadcast( (Message)(Message_GoalCompleteP1+p) );
}
}
}
@@ -1968,7 +1968,7 @@ public:
PlayerNumber pn = (PlayerNumber)IArg(1);
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 ); }
MESSAGEMAN->Broadcast( (Message)(MESSAGE_CURRENT_STEPS_P1_CHANGED+pn) );
MESSAGEMAN->Broadcast( (Message)(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; }
stepmania/src/HelpDisplay.cpp
+4 -4
View File
@@ -137,8 +137,8 @@ REGISTER_ACTOR_CLASS( GenreDisplay )
GenreDisplay::GenreDisplay()
{
this->SubscribeToMessage( MESSAGE_CURRENT_SONG_CHANGED );
this->SubscribeToMessage( MESSAGE_CURRENT_COURSE_CHANGED );
this->SubscribeToMessage( Message_CurrentSongChanged );
this->SubscribeToMessage( Message_CurrentCourseChanged);
}
GenreDisplay::~GenreDisplay()
@@ -147,7 +147,7 @@ GenreDisplay::~GenreDisplay()
void GenreDisplay::PlayCommand( const CString &sCommandName, Actor* pParent )
{
if( sCommandName == MessageToString(MESSAGE_CURRENT_SONG_CHANGED) )
if( sCommandName == MessageToString(Message_CurrentSongChanged) )
{
vector<CString> m_Artists, m_AltArtists;
@@ -159,7 +159,7 @@ void GenreDisplay::PlayCommand( const CString &sCommandName, Actor* pParent )
SetTips( m_Artists, m_AltArtists );
}
else if( sCommandName == MessageToString(MESSAGE_CURRENT_COURSE_CHANGED) )
else if( sCommandName == MessageToString(Message_CurrentCourseChanged) )
{
vector<CString> m_Artists, m_AltArtists;
stepmania/src/MemoryCardManager.cpp
+1 -1
View File
@@ -488,7 +488,7 @@ void MemoryCardManager::CheckStateChanges()
if( LastState == MEMORY_CARD_STATE_READY )
{
m_soundDisconnect.Play();
MESSAGEMAN->Broadcast( (Message)(MESSAGE_CARD_REMOVED_P1+p) );
MESSAGEMAN->Broadcast( (Message)(Message_CardRemovedP1+p) );
}
break;
case MEMORY_CARD_STATE_READY:
stepmania/src/MessageManager.cpp
+5 -5
View File
@@ -23,10 +23,10 @@ static const CString MessageNames[] = {
"EditStepsTypeChanged",
"EditSourceStepsChanged",
"EditSourceStepsTypeChanged",
"EditPreferredDifficutyP1Changed",
"EditPreferredDifficutyP2Changed",
"EditPreferredCourseDifficutyP1Changed",
"EditPreferredCourseDifficutyP2Changed",
"PreferredDifficutyP1Changed",
"PreferredDifficutyP2Changed",
"PreferredCourseDifficutyP1Changed",
"PreferredCourseDifficutyP2Changed",
"EditCourseEntryIndexChanged",
"EditLocalProfileIDChanged",
"GoalCompleteP1",
@@ -57,7 +57,7 @@ static const CString MessageNames[] = {
"PreferredSongGroupChanged",
"PreferredCourseGroupChanged",
};
XToString( Message, NUM_MESSAGES );
XToString( Message, NUM_Message );
static RageMutex g_Mutex( "MessageManager" );
stepmania/src/MessageManager.h
+45 -45
View File
@@ -29,52 +29,52 @@ struct lua_State;
enum Message
{
MESSAGE_CURRENT_STYLE_CHANGED,
MESSAGE_PLAY_MODE_CHANGED,
MESSAGE_CURRENT_SONG_CHANGED,
MESSAGE_CURRENT_STEPS_P1_CHANGED,
MESSAGE_CURRENT_STEPS_P2_CHANGED,
MESSAGE_CURRENT_COURSE_CHANGED,
MESSAGE_CURRENT_TRAIL_P1_CHANGED,
MESSAGE_CURRENT_TRAIL_P2_CHANGED,
MESSAGE_EDIT_STEPS_TYPE_CHANGED,
MESSAGE_EDIT_SOURCE_STEPS_CHANGED,
MESSAGE_EDIT_SOURCE_STEPS_TYPE_CHANGED,
MESSAGE_EDIT_PREFERRED_DIFFICULTY_P1_CHANGED,
MESSAGE_EDIT_PREFERRED_DIFFICULTY_P2_CHANGED,
MESSAGE_EDIT_PREFERRED_COURSE_DIFFICULTY_P1_CHANGED,
MESSAGE_EDIT_PREFERRED_COURSE_DIFFICULTY_P2_CHANGED,
MESSAGE_EDIT_COURSE_ENTRY_INDEX_CHANGED,
Message_CurrentStyleChanged,
Message_PlayModeChanged,
Message_CurrentSongChanged,
Message_CurrentStepsP1Changed,
Message_CurrentStepsP2Changed,
Message_CurrentCourseChanged,
Message_CurrentTrailP1Changed,
Message_CurrentTrailP2Changed,
Message_EditStepsTypeChanged,
Message_EditSourceStepsChanged,
Message_EditSourceStepsTypeChanged,
Message_PreferredDifficultyP1Changed,
Message_PreferredDifficultyP2Changed,
Message_PreferredCourseDifficultyP1Changed,
Message_PreferredCourseDifficultyP2Changed,
Message_EditCourseEntryIndexChanged,
Message_EditLocalProfileIDChanged,
MESSAGE_GOAL_COMPLETE_P1,
MESSAGE_GOAL_COMPLETE_P2,
MESSAGE_NOTE_CROSSED,
MESSAGE_NOTE_WILL_CROSS_IN_500MS,
MESSAGE_NOTE_WILL_CROSS_IN_1000MS,
MESSAGE_NOTE_WILL_CROSS_IN_1500MS,
MESSAGE_CARD_REMOVED_P1,
MESSAGE_CARD_REMOVED_P2,
MESSAGE_BEAT_CROSSED,
MESSAGE_MENU_UP_P1,
MESSAGE_MENU_UP_P2,
MESSAGE_MENU_DOWN_P1,
MESSAGE_MENU_DOWN_P2,
MESSAGE_MENU_LEFT_P1,
MESSAGE_MENU_LEFT_P2,
MESSAGE_MENU_RIGHT_P1,
MESSAGE_MENU_RIGHT_P2,
MESSAGE_MADE_CHOICE_P1,
MESSAGE_MADE_CHOICE_P2,
MESSAGE_COIN_INSERTED,
MESSAGE_SIDE_JOINED_P1,
MESSAGE_SIDE_JOINED_P2,
MESSAGE_PLAYERS_FINALIZED,
MESSAGE_ASSIST_TICK_CHANGED,
MESSAGE_AUTOSYNC_CHANGED,
MESSAGE_PREFERRED_SONG_GROUP_CHANGED,
MESSAGE_PREFERRED_COURSE_GROUP_CHANGED,
NUM_MESSAGES, // leave this at the end
MESSAGE_INVALID
Message_GoalCompleteP1,
Message_GoalCompleteP2,
Message_NoteCrossed,
Message_NoteWillCrossIn500Ms,
Message_NoteWillCrossIn1000Ms,
Message_NoteWillCrossIn1500Ms,
Message_CardRemovedP1,
Message_CardRemovedP2,
Message_BeatCrossed,
Message_MenuUpP1,
Message_MenuUpP2,
Message_MenuDownP1,
Message_MenuDownP2,
Message_MenuLeftP1,
Message_MenuLeftP2,
Message_MenuRightP1,
Message_MenuRightP2,
Message_MadeChoiceP1,
Message_MadeChoiceP2,
Message_CoinInserted,
Message_SideJoinedP1,
Message_SideJoinedP2,
Message_PlayersFinalized,
Message_AssistTickChanged,
Message_AutosyncChanged,
Message_PreferredSongGroupChanged,
Message_PreferredCourseGroupChanged,
NUM_Message, // leave this at the end
Message_Invalud
};
const CString& MessageToString( Message m );
stepmania/src/OptionRowHandler.cpp
+5 -5
View File
@@ -913,8 +913,8 @@ public:
else if( sParam == "EditSourceStepsType" )
{
m_pstToFill = &GAMESTATE->m_stEditSource;
m_vsReloadRowMessages.push_back( MessageToString(MESSAGE_CURRENT_STEPS_P1_CHANGED) );
m_vsReloadRowMessages.push_back( MessageToString(MESSAGE_EDIT_STEPS_TYPE_CHANGED) );
m_vsReloadRowMessages.push_back( MessageToString(Message_CurrentStepsP1Changed) );
m_vsReloadRowMessages.push_back( MessageToString(Message_EditStepsTypeChanged) );
if( GAMESTATE->m_pCurSteps[0].Get() != NULL )
defOut.m_vEnabledForPlayers.clear(); // hide row
}
@@ -1010,13 +1010,13 @@ public:
m_ppStepsToFill = &GAMESTATE->m_pCurSteps[0];
m_pDifficultyToFill = &GAMESTATE->m_PreferredDifficulty[0];
m_pst = &GAMESTATE->m_stEdit;
m_vsReloadRowMessages.push_back( MessageToString(MESSAGE_EDIT_STEPS_TYPE_CHANGED) );
m_vsReloadRowMessages.push_back( MessageToString(Message_EditStepsTypeChanged) );
}
else if( sParam == "EditSourceSteps" )
{
m_ppStepsToFill = &GAMESTATE->m_pEditSourceSteps;
m_pst = &GAMESTATE->m_stEditSource;
m_vsReloadRowMessages.push_back( MessageToString(MESSAGE_EDIT_SOURCE_STEPS_TYPE_CHANGED) );
m_vsReloadRowMessages.push_back( MessageToString(Message_EditSourceStepsTypeChanged) );
if( GAMESTATE->m_pCurSteps[0].Get() != NULL )
defOut.m_vEnabledForPlayers.clear(); // hide row
}
@@ -1031,7 +1031,7 @@ public:
defOut.m_layoutType = LAYOUT_SHOW_ONE_IN_ROW;
defOut.m_bExportOnChange = true;
defOut.m_bAllowThemeItems = false; // we theme the text ourself
m_vsReloadRowMessages.push_back( MessageToString(MESSAGE_CURRENT_SONG_CHANGED) );
m_vsReloadRowMessages.push_back( MessageToString(Message_CurrentSongChanged) );
if( GAMESTATE->m_pCurSong )
{
stepmania/src/Player.cpp
+2 -2
View File
@@ -119,7 +119,7 @@ Player::Player()
m_pNoteField = new NoteField;
this->SubscribeToMessage( MESSAGE_AUTOSYNC_CHANGED );
this->SubscribeToMessage( Message_AutosyncChanged );
}
Player::~Player()
@@ -1705,7 +1705,7 @@ bool Player::IsPlayingBeginner() const
void Player::HandleMessage( const CString& sMessage )
{
// Reset autosync samples when toggling
if( sMessage == MessageToString(MESSAGE_AUTOSYNC_CHANGED) )
if( sMessage == MessageToString(Message_AutosyncChanged) )
m_iOffsetSample = 0;
}
stepmania/src/ScreenDebugOverlay.cpp
+2 -2
View File
@@ -350,7 +350,7 @@ bool ScreenDebugOverlay::OverlayInput( const DeviceInput& DeviceI, const InputEv
GAMESTATE->m_SongOptions.m_bAssistTick = !GAMESTATE->m_SongOptions.m_bAssistTick;
/* Store this change, so it sticks if we change songs: */
GAMESTATE->m_StoredSongOptions.m_bAssistTick = GAMESTATE->m_SongOptions.m_bAssistTick;
MESSAGEMAN->Broadcast( MESSAGE_ASSIST_TICK_CHANGED );
MESSAGEMAN->Broadcast( Message_AssistTickChanged );
}
break;
case DebugLine_Autosync:
@@ -360,7 +360,7 @@ bool ScreenDebugOverlay::OverlayInput( const DeviceInput& DeviceI, const InputEv
SongOptions::AutosyncType as = (SongOptions::AutosyncType)(GAMESTATE->m_SongOptions.m_AutosyncType+1);
wrap( (int&)as, SongOptions::NUM_AUTOSYNC_TYPES );
GAMESTATE->m_SongOptions.m_AutosyncType = as;
MESSAGEMAN->Broadcast( MESSAGE_AUTOSYNC_CHANGED );
MESSAGEMAN->Broadcast( Message_AutosyncChanged );
}
break;
case DebugLine_CoinMode:
stepmania/src/ScreenGameplay.cpp
+2 -2
View File
@@ -1739,7 +1739,7 @@ void ScreenGameplay::SendCrossedMessages()
for( int r=iRowLastCrossed+1; r<=iRowNow; r++ )
{
if( GetNoteType( r ) == NOTE_TYPE_4TH )
MESSAGEMAN->Broadcast( MESSAGE_BEAT_CROSSED );
MESSAGEMAN->Broadcast( Message_BeatCrossed );
}
iRowLastCrossed = iRowNow;
@@ -1797,7 +1797,7 @@ void ScreenGameplay::SendCrossedMessages()
}
if( iNumTracksWithTapOrHoldHead > 0 )
MESSAGEMAN->Broadcast( (Message)(MESSAGE_NOTE_CROSSED + i) );
MESSAGEMAN->Broadcast( (Message)(Message_NoteCrossed + i) );
if( i == 0 && iNumTracksWithTapOrHoldHead >= 2 )
{
CString sMessageName = "NoteCrossedJump";
stepmania/src/ScreenSelectMaster.cpp
+5 -5
View File
@@ -397,7 +397,7 @@ void ScreenSelectMaster::MenuLeft( PlayerNumber pn, const InputEventType type )
if( Move(pn, MENU_DIR_LEFT) )
{
m_soundChange.Play();
MESSAGEMAN->Broadcast( (Message)(MESSAGE_MENU_LEFT_P1+pn) );
MESSAGEMAN->Broadcast( (Message)(Message_MenuLeftP1+pn) );
}
}
@@ -412,7 +412,7 @@ void ScreenSelectMaster::MenuRight( PlayerNumber pn, const InputEventType type )
if( Move(pn, MENU_DIR_RIGHT) )
{
m_soundChange.Play();
MESSAGEMAN->Broadcast( (Message)(MESSAGE_MENU_RIGHT_P1+pn) );
MESSAGEMAN->Broadcast( (Message)(Message_MenuRightP1+pn) );
}
}
@@ -427,7 +427,7 @@ void ScreenSelectMaster::MenuUp( PlayerNumber pn, const InputEventType type )
if( Move(pn, MENU_DIR_UP) )
{
m_soundChange.Play();
MESSAGEMAN->Broadcast( (Message)(MESSAGE_MENU_UP_P1+pn) );
MESSAGEMAN->Broadcast( (Message)(Message_MenuUpP1+pn) );
}
}
@@ -442,7 +442,7 @@ void ScreenSelectMaster::MenuDown( PlayerNumber pn, const InputEventType type )
if( Move(pn, MENU_DIR_DOWN) )
{
m_soundChange.Play();
MESSAGEMAN->Broadcast( (Message)(MESSAGE_MENU_DOWN_P1+pn) );
MESSAGEMAN->Broadcast( (Message)(Message_MenuDownP1+pn) );
}
}
@@ -642,7 +642,7 @@ float ScreenSelectMaster::DoMenuStart( PlayerNumber pn )
m_bChosen[pn] = true;
MESSAGEMAN->Broadcast( (Message)(MESSAGE_MADE_CHOICE_P1+pn) );
MESSAGEMAN->Broadcast( (Message)(Message_MadeChoiceP1+pn) );
bool bIsFirstToChoose = bAnyChosen;
stepmania/src/ScreenWithMenuElements.cpp
+1 -1
View File
@@ -301,7 +301,7 @@ void ScreenWithMenuElements::StopTimer()
void ScreenWithMenuElements::HandleMessage( const CString& sMessage )
{
if( sMessage == MessageToString(MESSAGE_CURRENT_SONG_CHANGED) )
if( sMessage == MessageToString(Message_CurrentSongChanged) )
UpdateStage();
}
stepmania/src/StepMania.cpp
+1 -1
View File
@@ -1276,7 +1276,7 @@ void InsertCoin( int iNum, const RageTimer *pTime )
BOOKKEEPER->CoinInserted();
SCREENMAN->RefreshCreditsMessages();
SCREENMAN->PlayCoinSound();
MESSAGEMAN->Broadcast( MESSAGE_COIN_INSERTED );
MESSAGEMAN->Broadcast( Message_CoinInserted );
}
void InsertCredit()