diff --git a/stepmania/src/MessageManager.cpp b/stepmania/src/MessageManager.cpp index e35a1ad048..eaeacee776 100644 --- a/stepmania/src/MessageManager.cpp +++ b/stepmania/src/MessageManager.cpp @@ -36,6 +36,8 @@ static const CString MessageNames[NUM_MESSAGES] = { "MenuLeftP2", "MenuRightP1", "MenuRightP2", + "MadeChoiceP1", + "MadeChoiceP2", }; XToString( Message, NUM_MESSAGES ); diff --git a/stepmania/src/MessageManager.h b/stepmania/src/MessageManager.h index 9a0dfbda46..c0357f3d4e 100644 --- a/stepmania/src/MessageManager.h +++ b/stepmania/src/MessageManager.h @@ -35,14 +35,16 @@ enum Message MESSAGE_CARD_REMOVED_P1, MESSAGE_CARD_REMOVED_P2, MESSAGE_BEAT_CROSSED, - MENU_UP_P1, - MENU_UP_P2, - MENU_DOWN_P1, - MENU_DOWN_P2, - MENU_LEFT_P1, - MENU_LEFT_P2, - MENU_RIGHT_P1, - MENU_RIGHT_P2, + 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, NUM_MESSAGES, MESSAGE_INVALID }; diff --git a/stepmania/src/ScreenSelectMaster.cpp b/stepmania/src/ScreenSelectMaster.cpp index 55b0b41922..dcf060d167 100644 --- a/stepmania/src/ScreenSelectMaster.cpp +++ b/stepmania/src/ScreenSelectMaster.cpp @@ -402,7 +402,7 @@ void ScreenSelectMaster::MenuLeft( PlayerNumber pn, const InputEventType type ) if( Move(pn, MENU_DIR_LEFT) ) { m_soundChange.Play(); - MESSAGEMAN->Broadcast( (Message)(MENU_LEFT_P1+pn) ); + MESSAGEMAN->Broadcast( (Message)(MESSAGE_MENU_LEFT_P1+pn) ); } } @@ -417,7 +417,7 @@ void ScreenSelectMaster::MenuRight( PlayerNumber pn, const InputEventType type ) if( Move(pn, MENU_DIR_RIGHT) ) { m_soundChange.Play(); - MESSAGEMAN->Broadcast( (Message)(MENU_RIGHT_P1+pn) ); + MESSAGEMAN->Broadcast( (Message)(MESSAGE_MENU_RIGHT_P1+pn) ); } } @@ -432,7 +432,7 @@ void ScreenSelectMaster::MenuUp( PlayerNumber pn, const InputEventType type ) if( Move(pn, MENU_DIR_UP) ) { m_soundChange.Play(); - MESSAGEMAN->Broadcast( (Message)(MENU_UP_P1+pn) ); + MESSAGEMAN->Broadcast( (Message)(MESSAGE_MENU_UP_P1+pn) ); } } @@ -447,7 +447,7 @@ void ScreenSelectMaster::MenuDown( PlayerNumber pn, const InputEventType type ) if( Move(pn, MENU_DIR_DOWN) ) { m_soundChange.Play(); - MESSAGEMAN->Broadcast( (Message)(MENU_DOWN_P1+pn) ); + MESSAGEMAN->Broadcast( (Message)(MESSAGE_MENU_DOWN_P1+pn) ); } } @@ -645,6 +645,8 @@ float ScreenSelectMaster::DoMenuStart( PlayerNumber pn ) m_bChosen[pn] = true; + MESSAGEMAN->Broadcast( (Message)(MESSAGE_MADE_CHOICE_P1+pn) ); + bool bIsFirstToChoose = bAnyChosen; float fSecs = 0;