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

add MadeChoice message

Browse Source
This commit is contained in:
Chris Danford
2005-05-04 09:58:12 +00:00
parent b8688e20f7
commit f7a594a49a
3 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/MessageManager.cpp
+2
View File
@@ -36,6 +36,8 @@ static const CString MessageNames[NUM_MESSAGES] = {
"MenuLeftP2", "MenuLeftP2",
"MenuRightP1", "MenuRightP1",
"MenuRightP2", "MenuRightP2",
"MadeChoiceP1",
"MadeChoiceP2",
}; };
XToString( Message, NUM_MESSAGES ); XToString( Message, NUM_MESSAGES );
stepmania/src/MessageManager.h
+10 -8
View File
@@ -35,14 +35,16 @@ enum Message
MESSAGE_CARD_REMOVED_P1, MESSAGE_CARD_REMOVED_P1,
MESSAGE_CARD_REMOVED_P2, MESSAGE_CARD_REMOVED_P2,
MESSAGE_BEAT_CROSSED, MESSAGE_BEAT_CROSSED,
MENU_UP_P1, MESSAGE_MENU_UP_P1,
MENU_UP_P2, MESSAGE_MENU_UP_P2,
MENU_DOWN_P1, MESSAGE_MENU_DOWN_P1,
MENU_DOWN_P2, MESSAGE_MENU_DOWN_P2,
MENU_LEFT_P1, MESSAGE_MENU_LEFT_P1,
MENU_LEFT_P2, MESSAGE_MENU_LEFT_P2,
MENU_RIGHT_P1, MESSAGE_MENU_RIGHT_P1,
MENU_RIGHT_P2, MESSAGE_MENU_RIGHT_P2,
MESSAGE_MADE_CHOICE_P1,
MESSAGE_MADE_CHOICE_P2,
NUM_MESSAGES, NUM_MESSAGES,
MESSAGE_INVALID MESSAGE_INVALID
}; };
stepmania/src/ScreenSelectMaster.cpp
+6 -4
View File
@@ -402,7 +402,7 @@ void ScreenSelectMaster::MenuLeft( PlayerNumber pn, const InputEventType type )
if( Move(pn, MENU_DIR_LEFT) ) if( Move(pn, MENU_DIR_LEFT) )
{ {
m_soundChange.Play(); 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) ) if( Move(pn, MENU_DIR_RIGHT) )
{ {
m_soundChange.Play(); 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) ) if( Move(pn, MENU_DIR_UP) )
{ {
m_soundChange.Play(); 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) ) if( Move(pn, MENU_DIR_DOWN) )
{ {
m_soundChange.Play(); 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; m_bChosen[pn] = true;
MESSAGEMAN->Broadcast( (Message)(MESSAGE_MADE_CHOICE_P1+pn) );
bool bIsFirstToChoose = bAnyChosen; bool bIsFirstToChoose = bAnyChosen;
float fSecs = 0; float fSecs = 0;