working on fixing up extra loads when entering play mode in the editor

2005-01-15 01:28:29 +00:00
parent 36445d1e1b
commit 3a9b2f7f4b
8 changed files with 70 additions and 46 deletions
@@ -831,9 +831,8 @@ void ScreenGameplay::SetupSong( PlayerNumber p, int iSongIndex )
 	{
 		NoteData nd = ndTransformed;
 		NoteDataUtil::RemoveAllTapsOfType( nd, TapNote::autoKeysound );
-		m_Player[p].Load( 
+		m_Player[p].Init( 
 			GAMESTATE->m_pPlayerState[p], 
-			nd, 
 			&g_CurStageStats.m_player[p],
 			m_pLifeMeter[p], 
 			m_pCombinedLifeMeter, 
@@ -842,6 +841,7 @@ void ScreenGameplay::SetupSong( PlayerNumber p, int iSongIndex )
 			m_pInventory[p], 
 			m_pPrimaryScoreKeeper[p], 
 			m_pSecondaryScoreKeeper[p] );
+		m_Player[p].Load( nd );
 	}

 	// load auto keysounds