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

different fNoteFieldLastBeatToDraw per-player

Browse Source
This commit is contained in:
Glenn Maynard
2003-09-23 23:23:09 +00:00
parent 47ff0c20c9
commit 03a778d642
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/GameState.cpp
+2 -2
View File
@@ -551,7 +551,7 @@ void GameState::ResetNoteSkins()
} }
/* From NoteField: */ /* From NoteField: */
extern float g_fNoteFieldLastBeatToDraw; extern float g_fNoteFieldLastBeatToDraw[NUM_PLAYERS];
void GameState::LaunchAttack( PlayerNumber target, Attack a ) void GameState::LaunchAttack( PlayerNumber target, Attack a )
{ {
@@ -576,7 +576,7 @@ void GameState::LaunchAttack( PlayerNumber target, Attack a )
* on screen with this skin. */ * on screen with this skin. */
const float CurBeat = this->m_fSongBeat; const float CurBeat = this->m_fSongBeat;
/* If reasonable, push the attack forward so notes on screen don't change suddenly. */ /* If reasonable, push the attack forward so notes on screen don't change suddenly. */
const float AddBeat = min( CurBeat+16, g_fNoteFieldLastBeatToDraw ); const float AddBeat = min( CurBeat+16, g_fNoteFieldLastBeatToDraw[target] );
const float AddSecond = this->m_pCurSong->GetElapsedTimeFromBeat( CurBeat ); const float AddSecond = this->m_pCurSong->GetElapsedTimeFromBeat( CurBeat );
const float EndSecond = AddSecond + a.fSecsRemaining; const float EndSecond = AddSecond + a.fSecsRemaining;
stepmania/src/NoteField.cpp
+2 -2
View File
@@ -346,7 +346,7 @@ float FindLastDisplayedBeat( PlayerNumber pn, int iLastPixelToDraw )
return fLastBeatToDraw; return fLastBeatToDraw;
} }
float g_fNoteFieldLastBeatToDraw = -1; float g_fNoteFieldLastBeatToDraw[NUM_PLAYERS] = { -1, -1 };
void NoteField::DrawPrimitives() void NoteField::DrawPrimitives()
{ {
@@ -377,7 +377,7 @@ void NoteField::DrawPrimitives()
float fLastBeatToDraw = FindLastDisplayedBeat( m_PlayerNumber, iLastPixelToDraw ); float fLastBeatToDraw = FindLastDisplayedBeat( m_PlayerNumber, iLastPixelToDraw );
/* Hack: */ /* Hack: */
g_fNoteFieldLastBeatToDraw = fLastBeatToDraw; g_fNoteFieldLastBeatToDraw[m_PlayerNumber] = fLastBeatToDraw;
const int iFirstIndexToDraw = BeatToNoteRow(fFirstBeatToDraw); const int iFirstIndexToDraw = BeatToNoteRow(fFirstBeatToDraw);
const int iLastIndexToDraw = BeatToNoteRow(fLastBeatToDraw); const int iLastIndexToDraw = BeatToNoteRow(fLastBeatToDraw);