From 7d84c57efa92175c829fb9ff69ded692296668ed Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Thu, 27 Nov 2003 23:45:38 +0000 Subject: [PATCH] take note skin name to *Row --- stepmania/src/GhostArrowRow.cpp | 10 +++++----- stepmania/src/GhostArrowRow.h | 2 +- stepmania/src/GrayArrowRow.cpp | 4 ++-- stepmania/src/GrayArrowRow.h | 2 +- stepmania/src/NoteField.cpp | 4 ++-- stepmania/src/ScreenNameEntry.cpp | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/stepmania/src/GhostArrowRow.cpp b/stepmania/src/GhostArrowRow.cpp index 664ee4e391..431a79a209 100644 --- a/stepmania/src/GhostArrowRow.cpp +++ b/stepmania/src/GhostArrowRow.cpp @@ -26,7 +26,7 @@ GhostArrowRow::GhostArrowRow() m_iNumCols = 0; } -void GhostArrowRow::Load( PlayerNumber pn, float fYReverseOffset ) +void GhostArrowRow::Load( PlayerNumber pn, CString NoteSkin, float fYReverseOffset ) { m_PlayerNumber = pn; m_fYReverseOffsetPixels = fYReverseOffset; @@ -52,10 +52,10 @@ void GhostArrowRow::Load( PlayerNumber pn, float fYReverseOffset ) m_GhostMine[c].Init( pn ); //m_HoldGhost[c].Init( pn ); - m_GhostDim[c].Load( NOTESKIN->GetPathTo(pn, Button, "tap explosion dim") ); - m_GhostBright[c].Load( NOTESKIN->GetPathTo(pn, Button, "tap explosion bright") ); - m_GhostMine[c].Load( NOTESKIN->GetPathTo(pn, Button, "tap explosion mine") ); - m_HoldGhost[c].Load( NOTESKIN->GetPathTo(pn, Button, "hold explosion") ); + m_GhostDim[c].Load( NOTESKIN->GetPathTo(NoteSkin, Button, "tap explosion dim") ); + m_GhostBright[c].Load( NOTESKIN->GetPathTo(NoteSkin, Button, "tap explosion bright") ); + m_GhostMine[c].Load( NOTESKIN->GetPathTo(NoteSkin, Button, "tap explosion mine") ); + m_HoldGhost[c].Load( NOTESKIN->GetPathTo(NoteSkin, Button, "hold explosion") ); } } diff --git a/stepmania/src/GhostArrowRow.h b/stepmania/src/GhostArrowRow.h index 858e171291..aedce9863d 100644 --- a/stepmania/src/GhostArrowRow.h +++ b/stepmania/src/GhostArrowRow.h @@ -26,7 +26,7 @@ public: virtual void Update( float fDeltaTime ); virtual void DrawPrimitives(); - void Load( PlayerNumber pn, float fYReverseOffset ); + void Load( PlayerNumber pn, CString NoteSkin, float fYReverseOffset ); void DidTapNote( int iCol, TapNoteScore score, bool bBright ); void DidTapMine( int iCol, TapNoteScore score ); diff --git a/stepmania/src/GrayArrowRow.cpp b/stepmania/src/GrayArrowRow.cpp index 8858bcf79d..eb85dc89f8 100644 --- a/stepmania/src/GrayArrowRow.cpp +++ b/stepmania/src/GrayArrowRow.cpp @@ -25,7 +25,7 @@ GrayArrowRow::GrayArrowRow() m_iNumCols = 0; } -void GrayArrowRow::Load( PlayerNumber pn, float fYReverseOffset ) +void GrayArrowRow::Load( PlayerNumber pn, CString NoteSkin, float fYReverseOffset ) { m_PlayerNumber = pn; m_fYReverseOffsetPixels = fYReverseOffset; @@ -35,7 +35,7 @@ void GrayArrowRow::Load( PlayerNumber pn, float fYReverseOffset ) m_iNumCols = pStyleDef->m_iColsPerPlayer; for( int c=0; cm_PlayerOptions[pn].m_sNoteSkin, m_PlayerNumber, c ); + m_GrayArrow[c].Load( NoteSkin, m_PlayerNumber, c ); } void GrayArrowRow::Update( float fDeltaTime ) diff --git a/stepmania/src/GrayArrowRow.h b/stepmania/src/GrayArrowRow.h index fe9e2197b4..e040bf6aaf 100644 --- a/stepmania/src/GrayArrowRow.h +++ b/stepmania/src/GrayArrowRow.h @@ -22,7 +22,7 @@ class GrayArrowRow : public ActorFrame public: GrayArrowRow(); - void Load( PlayerNumber pn, float fYReverseOffset ); + void Load( PlayerNumber pn, CString NoteSkin, float fYReverseOffset ); virtual void Update( float fDeltaTime ); virtual void DrawPrimitives(); diff --git a/stepmania/src/NoteField.cpp b/stepmania/src/NoteField.cpp index 36305c1242..b04f1c80fc 100644 --- a/stepmania/src/NoteField.cpp +++ b/stepmania/src/NoteField.cpp @@ -97,8 +97,8 @@ void NoteField::Load( const NoteData* pNoteData, PlayerNumber pn, int iFirstPixe this->CopyAll( pNoteData ); ASSERT( GetNumTracks() == GAMESTATE->GetCurrentStyleDef()->m_iColsPerPlayer ); - m_GrayArrowRow.Load( pn, m_fYReverseOffsetPixels ); - m_GhostArrowRow.Load( pn, m_fYReverseOffsetPixels ); + m_GrayArrowRow.Load( pn, GAMESTATE->m_PlayerOptions[pn].m_sNoteSkin, m_fYReverseOffsetPixels ); + m_GhostArrowRow.Load( pn, GAMESTATE->m_PlayerOptions[pn].m_sNoteSkin, m_fYReverseOffsetPixels ); CacheAllUsedNoteSkins(); RefreshBeatToNoteSkin(); diff --git a/stepmania/src/ScreenNameEntry.cpp b/stepmania/src/ScreenNameEntry.cpp index 4903707bb7..7edc562bf9 100644 --- a/stepmania/src/ScreenNameEntry.cpp +++ b/stepmania/src/ScreenNameEntry.cpp @@ -191,7 +191,7 @@ ScreenNameEntry::ScreenNameEntry( CString sClassName ) : Screen( sClassName ) /* Ensure that this is up-to-date. */ GAMESTATE->m_pPosition->Load( (PlayerNumber)p ); - m_GrayArrowRow[p].Load( (PlayerNumber)p, 0 ); + m_GrayArrowRow[p].Load( (PlayerNumber)p, GAMESTATE->m_PlayerOptions[p].m_sNoteSkin, 0 ); m_GrayArrowRow[p].SetX( (float)GAMESTATE->GetCurrentStyleDef()->m_iCenterX[p] ); m_GrayArrowRow[p].SetY( SCREEN_TOP + 100 ); this->AddChild( &m_GrayArrowRow[p] );