From bb2a8ea7595c0d011f3204176b4a8c7ce109bc34 Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Thu, 18 Sep 2008 07:56:47 +0000
Subject: [PATCH] broadcast NoteWillCross

---
 stepmania/src/ScreenGameplay.cpp | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp
index bf36d2c22c..547c1a6bff 100644
--- a/stepmania/src/ScreenGameplay.cpp
+++ b/stepmania/src/ScreenGameplay.cpp
@@ -2041,9 +2041,9 @@ void ScreenGameplay::SendCrossedMessages()
 		static int iRowLastCrossedAll[NUM_MESSAGES_TO_SEND] = { 0, 0, 0, 0 };
 		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 );
 
 			int iRowNow = BeatToNoteRowNotRounded( fSongBeat );
@@ -2060,14 +2060,13 @@ void ScreenGameplay::SendCrossedMessages()
 
 					iNumTracksWithTapOrHoldHead++;
 
-					// Send col-specific crossed
-					if( i == 0 )
-					{
-						const Style *pStyle = GAMESTATE->GetCurrentStyle();
-						RString sButton = pStyle->ColToButtonName( t );
-						RString sMessageName = "NoteCrossed" + sButton;
-						MESSAGEMAN->Broadcast( sMessageName );
-					}
+					// send crossed message
+					const Style *pStyle = GAMESTATE->GetCurrentStyle();
+					RString sButton = pStyle->ColToButtonName( t );
+					Message msg( i == 0 ? "NoteCrossed" : "NoteWillCross" );
+					msg.SetParam( "ButtonName", sButton );
+					msg.SetParam( "NumMessagesFromCrossed", i );
+					MESSAGEMAN->Broadcast( msg );
 				}
 
 				if( iNumTracksWithTapOrHoldHead > 0 )