different fNoteFieldLastBeatToDraw per-player
This commit is contained in:
@@ -551,7 +551,7 @@ void GameState::ResetNoteSkins()
|
||||
}
|
||||
|
||||
/* From NoteField: */
|
||||
extern float g_fNoteFieldLastBeatToDraw;
|
||||
extern float g_fNoteFieldLastBeatToDraw[NUM_PLAYERS];
|
||||
|
||||
void GameState::LaunchAttack( PlayerNumber target, Attack a )
|
||||
{
|
||||
@@ -576,7 +576,7 @@ void GameState::LaunchAttack( PlayerNumber target, Attack a )
|
||||
* on screen with this skin. */
|
||||
const float CurBeat = this->m_fSongBeat;
|
||||
/* 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 EndSecond = AddSecond + a.fSecsRemaining;
|
||||
|
||||
@@ -346,7 +346,7 @@ float FindLastDisplayedBeat( PlayerNumber pn, int iLastPixelToDraw )
|
||||
return fLastBeatToDraw;
|
||||
}
|
||||
|
||||
float g_fNoteFieldLastBeatToDraw = -1;
|
||||
float g_fNoteFieldLastBeatToDraw[NUM_PLAYERS] = { -1, -1 };
|
||||
|
||||
void NoteField::DrawPrimitives()
|
||||
{
|
||||
@@ -377,7 +377,7 @@ void NoteField::DrawPrimitives()
|
||||
float fLastBeatToDraw = FindLastDisplayedBeat( m_PlayerNumber, iLastPixelToDraw );
|
||||
|
||||
/* Hack: */
|
||||
g_fNoteFieldLastBeatToDraw = fLastBeatToDraw;
|
||||
g_fNoteFieldLastBeatToDraw[m_PlayerNumber] = fLastBeatToDraw;
|
||||
|
||||
const int iFirstIndexToDraw = BeatToNoteRow(fFirstBeatToDraw);
|
||||
const int iLastIndexToDraw = BeatToNoteRow(fLastBeatToDraw);
|
||||
|
||||
Reference in New Issue
Block a user