From 03a778d642ee5daec06bf3dd016365dab3e004b9 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Tue, 23 Sep 2003 23:23:09 +0000 Subject: [PATCH] different fNoteFieldLastBeatToDraw per-player --- stepmania/src/GameState.cpp | 4 ++-- stepmania/src/NoteField.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp index 399f5430c3..db7b7ffb28 100644 --- a/stepmania/src/GameState.cpp +++ b/stepmania/src/GameState.cpp @@ -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; diff --git a/stepmania/src/NoteField.cpp b/stepmania/src/NoteField.cpp index 9968c4704c..a96cdfcb45 100644 --- a/stepmania/src/NoteField.cpp +++ b/stepmania/src/NoteField.cpp @@ -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);