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

fix warning

Browse Source
This commit is contained in:
Chris Danford
2005-04-24 11:15:07 +00:00
parent 2a8f30fcd1
commit cc6369f044
2 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Course.cpp
+1 -1
View File
@@ -135,7 +135,7 @@ void Course::LoadFromCRSFile( CString sPath )
m_iLives = atoi( sParams[1] ); m_iLives = atoi( sParams[1] );
else if( 0 == stricmp(sValueName, "GAINSECONDS") ) else if( 0 == stricmp(sValueName, "GAINSECONDS") )
fGainSeconds = atof( sParams[1] ); fGainSeconds = (float)atof( sParams[1] );
else if( 0 == stricmp(sValueName, "METER") ) else if( 0 == stricmp(sValueName, "METER") )
{ {
stepmania/src/ScreenGameplay.cpp
+15 -18
View File
@@ -1752,28 +1752,25 @@ void ScreenGameplay::SendCrossedMessages()
{ {
float fOffsetFromCurrentSeconds = MESSAGE_SPACING_SECONDS * i; 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 if( m_CabinetLightsNoteData.IsThereATapOrHoldHeadAtRow(r) )
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) ) LOG->Trace( "r = %d", r );
{ MESSAGEMAN->Broadcast( (Message)(MESSAGE_NOTE_CROSSED + i) );
LOG->Trace( "r = %d", r ); break;
MESSAGEMAN->Broadcast( (Message)(MESSAGE_NOTE_CROSSED + i) );
break;
}
} }
iRowLastCrossed = iRowNow;
} }
iRowLastCrossed = iRowNow;
} }
} }