From aa6ca21d61ddd9d6fef62b5f49132625f7a3584c Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Thu, 7 Aug 2003 07:34:42 +0000 Subject: [PATCH] fix announcer playing before first note or between songs in a course --- stepmania/src/ScreenGameplay.cpp | 8 +++++++- stepmania/src/song.h | 2 -- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index d0ac7bab6b..32cafba6f7 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -193,7 +193,9 @@ ScreenGameplay::ScreenGameplay( bool bDemonstration ) : Screen("ScreenGameplay") m_bChangedOffsetOrBPM = GAMESTATE->m_SongOptions.m_bAutoSync; m_DancingState = STATE_INTRO; - m_fTimeLeftBeforeDancingComment = SECONDS_BETWEEN_COMMENTS; + + // Set this in LoadNextSong() + //m_fTimeLeftBeforeDancingComment = SECONDS_BETWEEN_COMMENTS; m_bZeroDeltaOnNextUpdate = false; @@ -827,6 +829,10 @@ void ScreenGameplay::LoadNextSong() m_Background.SetDiffuse( RageColor(1,1,1,1) ); + + m_fTimeLeftBeforeDancingComment = GAMESTATE->m_pCurSong->m_fFirstBeat + SECONDS_BETWEEN_COMMENTS; + + /* m_soundMusic and m_Background take a very long time to load, * so cap fDelta at 0 so m_NextSongIn will show up on screen. * -Chris */ diff --git a/stepmania/src/song.h b/stepmania/src/song.h index ae979df61d..b4f08b9edd 100644 --- a/stepmania/src/song.h +++ b/stepmania/src/song.h @@ -139,8 +139,6 @@ public: float m_fMusicLengthSeconds; float m_fFirstBeat; float m_fLastBeat; - float GetFirstBeat() const; - float GetLastBeat() const; float m_fMusicSampleStartSeconds; float m_fMusicSampleLengthSeconds; enum { DISPLAY_ACTUAL, DISPLAY_SPECIFIED, DISPLAY_RANDOM } m_DisplayBPMType;