[splittiming] move bogus variables back to GameState (210)

src/GameState.cpp

@@ -957,7 +957,13 @@ void GameState::UpdateSongPosition( float fPositionSeconds, const TimingData &ti
 	FOREACH_EnabledPlayer( pn )
 		m_pPlayerState[pn]->m_Position.UpdateSongPosition( fPositionSeconds, m_pCurSteps[pn]->m_Timing, timestamp );
 	
-	Actor::SetBGMTime( m_Position.m_fMusicSecondsVisible, m_Position.m_fSongBeatVisible, m_Position.fPositionSeconds, m_Position.m_fSongBeatNoOffset );
+	m_fMusicSecondsVisible = fPositionSeconds - g_fVisualDelaySeconds.Get();
+	float fThrowAway, fThrowAway2;
+	bool bThrowAway;
+	int iThrowAway;
+	timing.GetBeatAndBPSFromElapsedTime( m_fMusicSecondsVisible, m_fSongBeatVisible, fThrowAway, bThrowAway, bThrowAway, iThrowAway, fThrowAway2 );
+
+	Actor::SetBGMTime( m_Position.m_fMusicSecondsVisible, m_Position.m_fSongBeatVisible, fPositionSeconds, m_Position.m_fSongBeatNoOffset );
 //	LOG->Trace( "m_fMusicSeconds = %f, m_fSongBeat = %f, m_fCurBPS = %f, m_bFreeze = %f", m_fMusicSeconds, m_fSongBeat, m_fCurBPS, m_bFreeze );
 }
 

src/GameState.h

@@ -196,6 +196,8 @@ public:
 
 	// Music statistics:
 	SongPosition m_Position;
+	float		m_fMusicSecondsVisible;
+	float		m_fSongBeatVisible;
 
 	BroadcastOnChange<bool> m_bGameplayLeadIn;
 

src/SongPosition.cpp

@@ -34,12 +34,6 @@ void SongPosition::UpdateSongPosition( float fPositionSeconds, const TimingData
 
 	m_fSongBeatNoOffset = timing.GetBeatFromElapsedTimeNoOffset( fPositionSeconds );
 
-	m_fMusicSecondsVisible = fPositionSeconds - g_fVisualDelaySeconds.Get();
-	float fThrowAway, fThrowAway2;
-	bool bThrowAway;
-	int iThrowAway;
-	timing.GetBeatAndBPSFromElapsedTime( m_fMusicSecondsVisible, m_fSongBeatVisible, fThrowAway, bThrowAway, bThrowAway, iThrowAway, fThrowAway2 );
-
 	/*
 	// xxx testing: only do this on monotune survivor
 	if( m_pCurSong && m_pCurSong->GetDisplayFullTitle() == "monotune survivor" )
@@ -59,5 +53,4 @@ void SongPosition::UpdateSongPosition( float fPositionSeconds, const TimingData
 	}
 	*/
 
-
 }

src/SongPosition.h

@@ -32,9 +32,6 @@ class SongPosition
 	float		m_fWarpDestination;
 	RageTimer	m_LastBeatUpdate; // time of last m_fSongBeat, etc. update
 
-	float		m_fMusicSecondsVisible;
-	float		m_fSongBeatVisible;
-
 	void UpdateSongPosition( float fPositionSeconds, const TimingData &timing, const RageTimer &timestamp = RageZeroTimer );
 
 };