From e5af8b0f704b98bfb0a16ec0f2fdfc4837efa18c Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Fri, 18 Mar 2005 04:58:15 +0000
Subject: [PATCH] remove unnecessary CacheAllUsedNoteSkins calls; this is all
 done in NoteField::Init now

---
 stepmania/src/NoteField.h        | 3 ++-
 stepmania/src/Player.cpp         | 5 -----
 stepmania/src/Player.h           | 2 --
 stepmania/src/ScreenGameplay.cpp | 5 +----
 4 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/stepmania/src/NoteField.h b/stepmania/src/NoteField.h
index 27bfffca74..21d943358a 100644
--- a/stepmania/src/NoteField.h
+++ b/stepmania/src/NoteField.h
@@ -32,7 +32,6 @@ public:
 	int	m_iBeginMarker, m_iEndMarker;	// only used with MODE_EDIT
 
 	void FadeToFail();
-	void CacheAllUsedNoteSkins();
 	void CacheNoteSkin( CString skin );
 
 	void Step( int iCol, TapNoteScore score );
@@ -43,6 +42,8 @@ public:
 	void RefreshBeatToNoteSkin();
 
 protected:
+	void CacheAllUsedNoteSkins();
+
 	void DrawBeatBar( const float fBeat );
 	void DrawMarkerBar( int fBeat );
 	void DrawAreaHighlight( int iStartBeat, int iEndBeat );
diff --git a/stepmania/src/Player.cpp b/stepmania/src/Player.cpp
index 6b3ec4d59b..69c7ef22ce 100644
--- a/stepmania/src/Player.cpp
+++ b/stepmania/src/Player.cpp
@@ -1394,11 +1394,6 @@ float Player::GetMaxStepDistanceSeconds()
 	return GAMESTATE->m_SongOptions.m_fMusicRate * ADJUSTED_WINDOW(Boo);
 }
 
-void Player::CacheAllUsedNoteSkins()
-{
-	m_pNoteField->CacheAllUsedNoteSkins();
-}
-
 void Player::FadeToFail()
 {
 	if( m_pNoteField )
diff --git a/stepmania/src/Player.h b/stepmania/src/Player.h
index b86d602381..003412fe2e 100644
--- a/stepmania/src/Player.h
+++ b/stepmania/src/Player.h
@@ -55,8 +55,6 @@ public:
 
 	static float GetMaxStepDistanceSeconds();
 
-	void CacheAllUsedNoteSkins();
-
 	NoteData m_NoteData;
 
 protected:
diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp
index 6340e9bf12..347b5c92e7 100644
--- a/stepmania/src/ScreenGameplay.cpp
+++ b/stepmania/src/ScreenGameplay.cpp
@@ -695,7 +695,7 @@ void ScreenGameplay::Init()
 		}
 	}
 
-	FOREACH_PlayerNumber(pn)
+	FOREACH_EnabledPlayer(pn)
 		m_Player[pn].Init( 
 			PLAYER_TYPE,
 			GAMESTATE->m_pPlayerState[pn], 
@@ -867,9 +867,6 @@ void ScreenGameplay::SetupSong( PlayerNumber p, int iSongIndex )
 	// we'll do it on the first update and skip.
 	m_Player[p].ApplyWaitingTransforms();
 
-	/* Now that course options are applied, load any needed note skins and unload old ones. */
-	m_Player[p].CacheAllUsedNoteSkins();
-
 	/* Update attack bOn flags. */
 	GAMESTATE->Update(0);
 	GAMESTATE->RebuildPlayerOptionsFromActiveAttacks( p );