Use PlayerPlus (a Player plus a NoteData, this gives the old behavior of Player, i.e. calling Load( nd )).

stepmania/src/ScreenEdit.cpp

@@ -793,9 +793,10 @@ void ScreenEdit::PlayTicks()
 		iRowLastCrossed = iSongRow;
 
 	int iTickRow = -1;
+	const NoteData &nd = m_Player.GetNoteData();
 	// for each index we crossed since the last update:
-	FOREACH_NONEMPTY_ROW_ALL_TRACKS_RANGE( m_Player.m_NoteData, r, iRowLastCrossed+1, iSongRow+1 )
-		if( m_Player.m_NoteData.IsThereATapOrHoldHeadAtRow( r ) )
+	FOREACH_NONEMPTY_ROW_ALL_TRACKS_RANGE( nd, r, iRowLastCrossed+1, iSongRow+1 )
+		if( nd.IsThereATapOrHoldHeadAtRow( r ) )
 			iTickRow = r;
 
 	iRowLastCrossed = iSongRow;

stepmania/src/ScreenEdit.h

@@ -258,7 +258,7 @@ protected:
 
 // for MODE_PLAY
 	void SetupCourseAttacks();
-	Player			m_Player;
+	PlayerPlus		m_Player;
 	Background		m_Background;
 	Foreground		m_Foreground;
 	bool			m_bReturnToRecordMenuAfterPlay;

stepmania/src/ScreenHowToPlay.cpp

@@ -154,7 +154,7 @@ void ScreenHowToPlay::Init()
 		GAMESTATE->m_bGameplayLeadIn.Set( false );
 		GAMESTATE->m_pPlayerState[PLAYER_1]->m_PlayerController = PC_AUTOPLAY;
 
-		m_pPlayer = new Player;
+		m_pPlayer = new PlayerPlus;
 		m_pPlayer->Init( 
 			"Player",
 			GAMESTATE->m_pPlayerState[PLAYER_1], 

stepmania/src/ScreenHowToPlay.h

@@ -23,7 +23,7 @@ public:
 protected:
 	virtual void Step();
 	LifeMeterBar	*m_pLifeMeterBar;
-	Player		*m_pPlayer;
+	PlayerPlus	*m_pPlayer;
 	Model		*m_pmCharacter;
 	Model		*m_pmDancePad;
 	int		m_iW2s;