From ba8fb412312a3cd42a7b7dd089b5d7a951243a36 Mon Sep 17 00:00:00 2001 From: Steve Checkoway Date: Sun, 16 Jul 2006 07:23:12 +0000 Subject: [PATCH] Simplify. --- stepmania/src/BeginnerHelper.cpp | 5 ++--- stepmania/src/BeginnerHelper.h | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/stepmania/src/BeginnerHelper.cpp b/stepmania/src/BeginnerHelper.cpp index d16900f89f..f474b14f60 100644 --- a/stepmania/src/BeginnerHelper.cpp +++ b/stepmania/src/BeginnerHelper.cpp @@ -93,10 +93,9 @@ void BeginnerHelper::ShowStepCircle( PlayerNumber pn, int CSTEP ) m_sStepCircle[pn][isc].SetZoom( 0 ); } -void BeginnerHelper::AddPlayer( PlayerNumber pn, NoteData *pSteps ) +void BeginnerHelper::AddPlayer( PlayerNumber pn, const NoteData &ns ) { ASSERT( !m_bInitialized ); - ASSERT( pSteps != NULL ); ASSERT( pn >= 0 && pn < NUM_PLAYERS ); ASSERT( GAMESTATE->IsHumanPlayer(pn) ); @@ -108,7 +107,7 @@ void BeginnerHelper::AddPlayer( PlayerNumber pn, NoteData *pSteps ) if( !DoesFileExist(Character->GetModelPath()) ) return; - m_NoteData[pn].CopyAll( *pSteps ); + m_NoteData[pn].CopyAll( ns ); m_bPlayerEnabled[pn] = true; } diff --git a/stepmania/src/BeginnerHelper.h b/stepmania/src/BeginnerHelper.h index 33b957fd1b..bfdfc55d11 100644 --- a/stepmania/src/BeginnerHelper.h +++ b/stepmania/src/BeginnerHelper.h @@ -17,7 +17,7 @@ public: bool Initialize( int iDancePadType ); bool IsInitialized() { return m_bInitialized; } static bool CanUse(); - void AddPlayer( PlayerNumber pn, NoteData *pSteps ); + void AddPlayer( PlayerNumber pn, const NoteData &nd ); void ShowStepCircle( PlayerNumber pn, int CSTEP ); bool m_bShowBackground;