fix warning
This commit is contained in:
@@ -135,7 +135,7 @@ void Course::LoadFromCRSFile( CString sPath )
|
||||
m_iLives = atoi( sParams[1] );
|
||||
|
||||
else if( 0 == stricmp(sValueName, "GAINSECONDS") )
|
||||
fGainSeconds = atof( sParams[1] );
|
||||
fGainSeconds = (float)atof( sParams[1] );
|
||||
|
||||
else if( 0 == stricmp(sValueName, "METER") )
|
||||
{
|
||||
|
||||
@@ -1752,28 +1752,25 @@ void ScreenGameplay::SendCrossedMessages()
|
||||
{
|
||||
float fOffsetFromCurrentSeconds = MESSAGE_SPACING_SECONDS * i;
|
||||
|
||||
bool bCrossedABeat = false;
|
||||
float fPositionSeconds = GAMESTATE->m_fMusicSeconds + fOffsetFromCurrentSeconds; // trigger the light a tiny bit early
|
||||
float fSongBeat = GAMESTATE->m_pCurSong->GetBeatFromElapsedTime( fPositionSeconds );
|
||||
|
||||
int iRowNow = BeatToNoteRowNotRounded( fSongBeat );
|
||||
iRowNow = max( 0, iRowNow );
|
||||
static int iRowLastCrossedAll[NUM_MESSAGES_TO_SEND] = { 0, 0, 0, 0 };
|
||||
int &iRowLastCrossed = iRowLastCrossedAll[i];
|
||||
|
||||
FOREACH_NONEMPTY_ROW_ALL_TRACKS_RANGE( m_Player[pn].m_NoteData, r, iRowLastCrossed+1, iRowNow+1 )
|
||||
{
|
||||
float fPositionSeconds = GAMESTATE->m_fMusicSeconds + fOffsetFromCurrentSeconds; // trigger the light a tiny bit early
|
||||
float fSongBeat = GAMESTATE->m_pCurSong->GetBeatFromElapsedTime( fPositionSeconds );
|
||||
|
||||
int iRowNow = BeatToNoteRowNotRounded( fSongBeat );
|
||||
iRowNow = max( 0, iRowNow );
|
||||
static int iRowLastCrossedAll[NUM_MESSAGES_TO_SEND] = { 0, 0, 0, 0 };
|
||||
int &iRowLastCrossed = iRowLastCrossedAll[i];
|
||||
|
||||
FOREACH_NONEMPTY_ROW_ALL_TRACKS_RANGE( m_Player[pn].m_NoteData, r, iRowLastCrossed+1, iRowNow+1 )
|
||||
if( m_CabinetLightsNoteData.IsThereATapOrHoldHeadAtRow(r) )
|
||||
{
|
||||
if( m_CabinetLightsNoteData.IsThereATapOrHoldHeadAtRow(r) )
|
||||
{
|
||||
LOG->Trace( "r = %d", r );
|
||||
MESSAGEMAN->Broadcast( (Message)(MESSAGE_NOTE_CROSSED + i) );
|
||||
break;
|
||||
}
|
||||
LOG->Trace( "r = %d", r );
|
||||
MESSAGEMAN->Broadcast( (Message)(MESSAGE_NOTE_CROSSED + i) );
|
||||
break;
|
||||
}
|
||||
|
||||
iRowLastCrossed = iRowNow;
|
||||
}
|
||||
|
||||
iRowLastCrossed = iRowNow;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user