broadcast NoteWillCross

This commit is contained in:
Chris Danford
2008-09-18 07:56:47 +00:00
parent 3805c1e600
commit bb2a8ea759
+7 -8
View File
@@ -2041,9 +2041,9 @@ void ScreenGameplay::SendCrossedMessages()
static int iRowLastCrossedAll[NUM_MESSAGES_TO_SEND] = { 0, 0, 0, 0 }; static int iRowLastCrossedAll[NUM_MESSAGES_TO_SEND] = { 0, 0, 0, 0 };
for( int i=0; i<NUM_MESSAGES_TO_SEND; i++ ) for( int i=0; i<NUM_MESSAGES_TO_SEND; i++ )
{ {
float fOffsetFromCurrentSeconds = MESSAGE_SPACING_SECONDS * i; float fNoteWillCrossInSeconds = MESSAGE_SPACING_SECONDS * i;
float fPositionSeconds = GAMESTATE->m_fMusicSeconds + fOffsetFromCurrentSeconds; float fPositionSeconds = GAMESTATE->m_fMusicSeconds + fNoteWillCrossInSeconds;
float fSongBeat = GAMESTATE->m_pCurSong->GetBeatFromElapsedTime( fPositionSeconds ); float fSongBeat = GAMESTATE->m_pCurSong->GetBeatFromElapsedTime( fPositionSeconds );
int iRowNow = BeatToNoteRowNotRounded( fSongBeat ); int iRowNow = BeatToNoteRowNotRounded( fSongBeat );
@@ -2060,14 +2060,13 @@ void ScreenGameplay::SendCrossedMessages()
iNumTracksWithTapOrHoldHead++; iNumTracksWithTapOrHoldHead++;
// Send col-specific crossed // send crossed message
if( i == 0 )
{
const Style *pStyle = GAMESTATE->GetCurrentStyle(); const Style *pStyle = GAMESTATE->GetCurrentStyle();
RString sButton = pStyle->ColToButtonName( t ); RString sButton = pStyle->ColToButtonName( t );
RString sMessageName = "NoteCrossed" + sButton; Message msg( i == 0 ? "NoteCrossed" : "NoteWillCross" );
MESSAGEMAN->Broadcast( sMessageName ); msg.SetParam( "ButtonName", sButton );
} msg.SetParam( "NumMessagesFromCrossed", i );
MESSAGEMAN->Broadcast( msg );
} }
if( iNumTracksWithTapOrHoldHead > 0 ) if( iNumTracksWithTapOrHoldHead > 0 )