[splittiming] NoteDisplay, NoteField, Player, PlayerState (182)

src/PlayerState.cpp

@@ -69,8 +69,8 @@ void PlayerState::Update( float fDelta )
 
 		bool bCurrentlyEnabled =
 			attack.bGlobal ||
-			( attack.fStartSecond < GAMESTATE->m_fMusicSeconds &&
-			GAMESTATE->m_fMusicSeconds < attack.fStartSecond+attack.fSecsRemaining );
+			( attack.fStartSecond < m_Position.m_fMusicSeconds &&
+			m_Position.m_fMusicSeconds < attack.fStartSecond+attack.fSecsRemaining );
 
 		if( m_ActiveAttacks[s].bOn == bCurrentlyEnabled )
 			continue; // OK
@@ -116,7 +116,7 @@ void PlayerState::LaunchAttack( const Attack& a )
 	 * so Player::Update knows to apply attack transforms correctly. (yuck) */
 	m_ModsToApply.push_back( attack );
 	if( attack.fStartSecond == -1 )
-		attack.fStartSecond = GAMESTATE->m_fMusicSeconds;
+		attack.fStartSecond = m_Position.m_fMusicSeconds;
 	m_ActiveAttacks.push_back( attack );
 
 	RebuildPlayerOptionsFromActiveAttacks();