deps cleanup

stepmania/src/Player.cpp

@@ -2,6 +2,7 @@
 #include "Player.h"
 #include "GameConstantsAndTypes.h"
 #include "RageUtil.h"
+#include "RageTimer.h"
 #include "PrefsManager.h"
 #include "GameConstantsAndTypes.h"
 #include "GameManager.h"
@@ -18,6 +19,7 @@
 #include "LifeMeter.h"
 #include "CombinedLifeMeter.h"
 #include "PlayerAI.h"
+#include "NoteField.h"
 #include "NoteFieldPositioning.h"
 #include "NoteDataUtil.h"
 #include "ScreenGameplay.h" /* for SM_ComboStopped */
@@ -658,7 +660,7 @@ int Player::GetClosestNote( int col, float fBeat, float fMaxBeatsAhead, float fM
 }
 
 
-void Player::Step( int col, RageTimer tm )
+void Player::Step( int col, const RageTimer &tm )
 {
 	bool bOniDead = 
 		GAMESTATE->m_SongOptions.m_LifeType == SongOptions::LIFE_BATTERY  &&  
@@ -1392,6 +1394,11 @@ float Player::GetMaxStepDistanceSeconds()
 	return GAMESTATE->m_SongOptions.m_fMusicRate * ADJUSTED_WINDOW(Boo);
 }
 
+void Player::CacheAllUsedNoteSkins( bool bDeleteUnused )
+{
+	m_pNoteField->CacheAllUsedNoteSkins( bDeleteUnused );
+}
+
 void Player::FadeToFail()
 {
 	if( m_pNoteField )

stepmania/src/Player.h

@@ -8,16 +8,17 @@
 #include "HoldJudgment.h"
 #include "Combo.h"
 #include "NoteDataWithScoring.h"
-#include "RageTimer.h"
 #include "RageSound.h"
 #include "AttackDisplay.h"
-#include "NoteField.h"
+#include "NoteData.h"
 
 class ScoreDisplay;
 class LifeMeter;
 class CombinedLifeMeter;
 class ScoreKeeper;
 class Inventory;
+class RageTimer;
+class NoteField;
 struct PlayerStageStats;
 
 #define	SAMPLE_COUNT	16
@@ -44,7 +45,7 @@ public:
 	void Load( const NoteData& noteData );
 	void CrossedRow( int iNoteRow );
 	void CrossedMineRow( int iNoteRow );
-	void Step( int col, RageTimer tm );
+	void Step( int col, const RageTimer &tm );
 	void RandomizeNotes( int iNoteRow );
 	void FadeToFail();
 	int GetDancingCharacterState() const { return m_iDCState; };
@@ -53,7 +54,7 @@ public:
 
 	static float GetMaxStepDistanceSeconds();
 
-	void CacheAllUsedNoteSkins( bool bDeleteUnused ) { m_pNoteField->CacheAllUsedNoteSkins(bDeleteUnused); }
+	void CacheAllUsedNoteSkins( bool bDeleteUnused );
 
 	NoteData m_NoteData;
 

stepmania/src/ScreenEdit.h

@@ -13,7 +13,7 @@
 #include "Background.h"
 #include "Foreground.h"
 #include "Course.h"
-
+#include "NoteField.h"
 
 const int NUM_ACTION_MENU_ITEMS = 23;
 const int NUM_NAMING_MENU_ITEMS = 6;

stepmania/src/ScreenHowToPlay.h

@@ -6,6 +6,7 @@
 #include "LifeMeterBar.h"
 #include "Character.h"
 #include "BGAnimation.h"
+#include "Model.h"
 
 
 class ScreenHowToPlay : public ScreenAttract