From 6ba1963fbebc32119af4ae0b9703bd146ee102ae Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Mon, 30 Sep 2002 16:57:34 +0000 Subject: [PATCH] Theme element reencoding, resizing, renaming etc... --- stepmania/TODO.chris | 2 + stepmania/Themes/default/metrics.ini | 36 +++---- stepmania/src/ScreenEz2SelectPlayer.cpp | 81 +++++++++------- stepmania/src/ScreenEz2SelectPlayer.h | 6 +- stepmania/src/ScreenSelectDifficulty.cpp | 40 ++++---- stepmania/src/ScreenSelectDifficulty.h | 2 +- stepmania/src/ScreenSelectMode.cpp | 115 +++++++++++++---------- stepmania/src/ScreenSelectMode.h | 8 +- 8 files changed, 165 insertions(+), 125 deletions(-) diff --git a/stepmania/TODO.chris b/stepmania/TODO.chris index 29890b8d77..9d47bd2a80 100644 --- a/stepmania/TODO.chris +++ b/stepmania/TODO.chris @@ -2,6 +2,8 @@ Fix ///////////////////////// +select music score font size + more traditional particle system in BGAnimationLayer? - fog - particle lifetime diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 01b154dd7e..7cb8b8614c 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -43,18 +43,20 @@ NextScreen=ScreenCaution NextScreen=ScreenSelectStyle [ScreenEz2SelectPlayer] -CursorP1X=120 -CursorP1Y=335 -CursorP2X=520 -CursorP2Y=335 -ControllerP1X=120 -ControllerP1Y=350 -ControllerP2X=520 -ControllerP2Y=350 +JoinFrameP1X=120 +JoinFrameP1Y=350 +JoinFrameP2X=520 +JoinFrameP2Y=350 +JoinMessageP1X=120 +JoinMessageP1Y=336 +JoinMessageP2X=520 +JoinMessageP2Y=336 HelpText=Press $ on the pad to join TimerSeconds=40 NextScreen=ScreenSelectGroup SilentWait=1 +BounceJoinMessage=1 +FoldOnJoin=1 [ScreenSelectStyle] IconsStartX=60 @@ -77,14 +79,14 @@ TimerSeconds=40 NextScreen=ScreenSelectDifficulty [ScreenSelectMode] -CursorP1X=120 -CursorP1Y=335 -CursorP2X=520 -CursorP2Y=335 -ControllerP1X=120 -ControllerP1Y=350 -ControllerP2X=520 -ControllerP2Y=350 +JoinFrameP1X=120 +JoinFrameP1Y=350 +JoinFrameP2X=520 +JoinFrameP2Y=350 +JoinMessageP1X=120 +JoinMessageP1Y=336 +JoinMessageP2X=520 +JoinMessageP2Y=336 HelpText=Press $ on the pad to join. Press ! " to change styles, then press START TimerSeconds=40 NextScreen=ScreenSelectGroup @@ -92,6 +94,8 @@ ScrollingListX=320 ScrollingListY=250 UseSelectionBGAnimations=0 SelectionSpecificBGAnimations=0 +BounceJoinMessage=1 +FoldOnJoin=1 [ScreenSelectDifficulty] MorePage1X=580 diff --git a/stepmania/src/ScreenEz2SelectPlayer.cpp b/stepmania/src/ScreenEz2SelectPlayer.cpp index c3b8ec7cce..7bc47a5d24 100644 --- a/stepmania/src/ScreenEz2SelectPlayer.cpp +++ b/stepmania/src/ScreenEz2SelectPlayer.cpp @@ -27,14 +27,16 @@ const ScreenMessage SM_GoToPrevScreen = ScreenMessage(SM_User + 1); const ScreenMessage SM_GoToNextScreen = ScreenMessage(SM_User + 2); -#define CURSOR_X( p ) THEME->GetMetricF("ScreenEz2SelectPlayer",ssprintf("CursorP%dX",p+1)) -#define CURSOR_Y( i ) THEME->GetMetricF("ScreenEz2SelectPlayer",ssprintf("CursorP%dY",i+1)) -#define CONTROLLER_X( p ) THEME->GetMetricF("ScreenEz2SelectPlayer",ssprintf("ControllerP%dX",p+1)) -#define CONTROLLER_Y( i ) THEME->GetMetricF("ScreenEz2SelectPlayer",ssprintf("ControllerP%dY",i+1)) +#define JOIN_FRAME_X( p ) THEME->GetMetricF("ScreenEz2SelectPlayer",ssprintf("JoinFrameP%dX",p+1)) +#define JOIN_FRAME_Y( i ) THEME->GetMetricF("ScreenEz2SelectPlayer",ssprintf("JoinFrameP%dY",i+1)) +#define JOIN_MESSAGE_X( p ) THEME->GetMetricF("ScreenEz2SelectPlayer",ssprintf("JoinMessageP%dX",p+1)) +#define JOIN_MESSAGE_Y( i ) THEME->GetMetricF("ScreenEz2SelectPlayer",ssprintf("JoinMessageP%dY",i+1)) #define HELP_TEXT THEME->GetMetric("ScreenEz2SelectPlayer","HelpText") #define TIMER_SECONDS THEME->GetMetricI("ScreenEz2SelectPlayer","TimerSeconds") #define NEXT_SCREEN THEME->GetMetric("ScreenEz2SelectPlayer","NextScreen") #define SILENT_WAIT THEME->GetMetricI("ScreenEz2SelectPlayer","SilentWait") +#define BOUNCE_JOIN_MESSAGE THEME->GetMetricB("ScreenEz2SelectPlayer","BounceJoinMessage") +#define FOLD_ON_JOIN THEME->GetMetricB("ScreenEz2SelectPlayer","FoldOnJoin") const float TWEEN_TIME = 0.35f; @@ -55,7 +57,7 @@ ScreenEz2SelectPlayer::ScreenEz2SelectPlayer() LOG->Trace( "ScreenEz2SelectPlayer::ScreenEz2SelectPlayer()" ); m_Menu.Load( - THEME->GetPathTo("Graphics","select player background"), + THEME->GetPathTo("BGAnimations","ez2 select player"), THEME->GetPathTo("Graphics","select player top edge"), HELP_TEXT, false, true, TIMER_SECONDS ); @@ -64,20 +66,35 @@ ScreenEz2SelectPlayer::ScreenEz2SelectPlayer() m_Background.LoadFromAniDir( THEME->GetPathTo("BGAnimations","ez2 select player") ); this->AddChild( &m_Background ); // animated background =) - m_logo.Load( THEME->GetPathTo("Graphics","select player logo")); - m_logo.SetXY( CENTER_X, CENTER_Y); - this->AddChild( &m_logo ); - for( p=0; pGetPathTo("Graphics",ssprintf("select player controller p%d", p+1)) ); // two of these for pump support. - m_sprControllers[p].SetXY( CONTROLLER_X(p), CONTROLLER_Y(p) ); - this->AddChild( &m_sprControllers[p] ); + m_sprJoinFrame[p].Load( THEME->GetPathTo("Graphics","select player join frame 1x2") ); + m_sprJoinFrame[p].StopAnimating(); + m_sprJoinFrame[p].SetState( p ); + m_sprJoinFrame[p].SetXY( JOIN_FRAME_X(p), JOIN_FRAME_Y(p) ); + this->AddChild( &m_sprJoinFrame[p] ); - m_sprCursors[p].Load( THEME->GetPathTo("Graphics",ssprintf("select player cursor p%d",p+1)) ); - m_sprCursors[p].SetXY( CURSOR_X(p), CURSOR_Y(p) ); - m_sprCursors[p].SetEffectBouncing( D3DXVECTOR3(0,10,0), 0.5f ); - this->AddChild( &m_sprCursors[p] ); + if( GAMESTATE->m_bSideIsJoined[p] ) + m_sprJoinFrame[p].SetZoomY( 0 ); + + m_sprJoinMessage[p].Load( THEME->GetPathTo("Graphics","select player join message 2x2") ); + m_sprJoinMessage[p].StopAnimating(); + m_sprJoinMessage[p].SetState( p ); + m_sprJoinMessage[p].SetXY( JOIN_MESSAGE_X(p), JOIN_MESSAGE_Y(p) ); + if( BOUNCE_JOIN_MESSAGE ) + m_sprJoinMessage[p].SetEffectBouncing( D3DXVECTOR3(0,10,0), 0.5f ); + this->AddChild( &m_sprJoinMessage[p] ); + + if( GAMESTATE->m_bSideIsJoined[p] ) + { + m_sprJoinMessage[p].SetState( p+NUM_PLAYERS ); + + if( FOLD_ON_JOIN ) + { + m_sprJoinMessage[p].SetZoomY( 0 ); + m_sprJoinFrame[p].SetZoomY( 0 ); + } + } } m_soundSelect.Load( THEME->GetPathTo("Sounds","menu start") ); @@ -204,10 +221,10 @@ void ScreenEz2SelectPlayer::MenuStart( PlayerNumber pn ) GAMESTATE->m_bSideIsJoined[pn] = true; SCREENMAN->RefreshCreditsMessages(); m_soundSelect.Play(); - m_sprCursors[pn].BeginTweening( 0.25f ); - m_sprCursors[pn].SetTweenZoomY( 0 ); - m_sprControllers[pn].BeginTweening( 0.25f ); - m_sprControllers[pn].SetTweenZoomY( 0 ); + m_sprJoinMessage[pn].BeginTweening( 0.25f ); + m_sprJoinMessage[pn].SetTweenZoomY( 0 ); + m_sprJoinFrame[pn].BeginTweening( 0.25f ); + m_sprJoinFrame[pn].SetTweenZoomY( 0 ); bool bBothSidesJoined = true; for( int p=0; pIsPlayerEnabled((PlayerNumber)p) ) continue; - m_sprCursorShadow[p].Load( THEME->GetPathTo("Graphics", "select difficulty cursor 2x1") ); - m_sprCursorShadow[p].StopAnimating(); - m_sprCursorShadow[p].SetState( p ); - m_sprCursorShadow[p].TurnShadowOff(); - m_sprCursorShadow[p].SetDiffuse( D3DXCOLOR(0,0,0,0.6f) ); - m_framePages.AddChild( &m_sprCursorShadow[p] ); + m_sprJoinMessagehadow[p].Load( THEME->GetPathTo("Graphics", "select difficulty cursor 2x1") ); + m_sprJoinMessagehadow[p].StopAnimating(); + m_sprJoinMessagehadow[p].SetState( p ); + m_sprJoinMessagehadow[p].TurnShadowOff(); + m_sprJoinMessagehadow[p].SetDiffuse( D3DXCOLOR(0,0,0,0.6f) ); + m_framePages.AddChild( &m_sprJoinMessagehadow[p] ); m_sprCursor[p].Load( THEME->GetPathTo("Graphics", "select difficulty cursor 2x1") ); m_sprCursor[p].StopAnimating(); @@ -368,10 +368,10 @@ void ScreenSelectDifficulty::ChangeTo( PlayerNumber pn, int iSelectionWas, int i m_sprCursor[p].SetTweenX( CURSOR_X(m_iSelection[p],(PlayerNumber)p) - CURSOR_SHADOW_LENGTH_X ); m_sprCursor[p].SetTweenY( CURSOR_Y(m_iSelection[p],(PlayerNumber)p) - CURSOR_SHADOW_LENGTH_Y ); - m_sprCursorShadow[p].StopTweening(); - m_sprCursorShadow[p].BeginTweening( 0.2f, bChangedPages ? TWEEN_LINEAR : TWEEN_BIAS_BEGIN ); - m_sprCursorShadow[p].SetTweenX( CURSOR_X(m_iSelection[p],(PlayerNumber)p) ); - m_sprCursorShadow[p].SetTweenY( CURSOR_Y(m_iSelection[p],(PlayerNumber)p) ); + m_sprJoinMessagehadow[p].StopTweening(); + m_sprJoinMessagehadow[p].BeginTweening( 0.2f, bChangedPages ? TWEEN_LINEAR : TWEEN_BIAS_BEGIN ); + m_sprJoinMessagehadow[p].SetTweenX( CURSOR_X(m_iSelection[p],(PlayerNumber)p) ); + m_sprJoinMessagehadow[p].SetTweenY( CURSOR_Y(m_iSelection[p],(PlayerNumber)p) ); } } @@ -422,9 +422,9 @@ void ScreenSelectDifficulty::MenuStart( PlayerNumber pn ) m_sprOK[pn].SetTweenZoom( 1 ); m_sprOK[pn].SetTweenDiffuse( D3DXCOLOR(1,1,1,1) ); - m_sprCursorShadow[pn].BeginTweening( 0.2f ); - m_sprCursorShadow[pn].BeginTweening( 0.2f ); - m_sprCursorShadow[pn].SetDiffuse( D3DXCOLOR(0,0,0,0) ); + m_sprJoinMessagehadow[pn].BeginTweening( 0.2f ); + m_sprJoinMessagehadow[pn].BeginTweening( 0.2f ); + m_sprJoinMessagehadow[pn].SetDiffuse( D3DXCOLOR(0,0,0,0) ); // check to see if everyone has chosen @@ -473,8 +473,8 @@ void ScreenSelectDifficulty::TweenOffScreen() m_sprOK[p].BeginTweening( 0.3f ); m_sprOK[p].SetTweenZoom( 0 ); - m_sprCursorShadow[p].BeginTweening( 0.3f ); - m_sprCursorShadow[p].SetTweenDiffuse( D3DXCOLOR(0,0,0,0) ); + m_sprJoinMessagehadow[p].BeginTweening( 0.3f ); + m_sprJoinMessagehadow[p].SetTweenDiffuse( D3DXCOLOR(0,0,0,0) ); } for( int d=0; dGetMetricF("ScreenSelectMode",ssprintf("CursorP%dX",p+1)) -#define CURSOR_Y( i ) THEME->GetMetricF("ScreenSelectMode",ssprintf("CursorP%dY",i+1)) -#define CONTROLLER_X( p ) THEME->GetMetricF("ScreenSelectMode",ssprintf("ControllerP%dX",p+1)) -#define CONTROLLER_Y( i ) THEME->GetMetricF("ScreenSelectMode",ssprintf("ControllerP%dY",i+1)) -#define HELP_TEXT THEME->GetMetric("ScreenSelectMode","HelpText") -#define TIMER_SECONDS THEME->GetMetricI("ScreenSelectMode","TimerSeconds") -#define NEXT_SCREEN THEME->GetMetric("ScreenSelectMode","NextScreen") -#define SCROLLING_ELEMENT_SPACING THEME->GetMetricI("ScreenSelectMode","ScrollingElementSpacing") -#define SCROLLING_LIST_X THEME->GetMetricF("ScreenSelectMode","ScrollingListX") -#define SCROLLING_LIST_Y THEME->GetMetricF("ScreenSelectMode","ScrollingListY") -#define SELECTION_SPECIFIC_BG_ANIMATIONS THEME->GetMetricB("ScreenSelectMode","SelectionSpecificBGAnimations") +#define JOIN_FRAME_X( p ) THEME->GetMetricF("ScreenSelectMode",ssprintf("JoinFrameP%dX",p+1)) +#define JOIN_FRAME_Y( i ) THEME->GetMetricF("ScreenSelectMode",ssprintf("JoinFrameP%dY",i+1)) +#define JOIN_MESSAGE_X( p ) THEME->GetMetricF("ScreenSelectMode",ssprintf("JoinMessageP%dX",p+1)) +#define JOIN_MESSAGE_Y( i ) THEME->GetMetricF("ScreenSelectMode",ssprintf("JoinMessageP%dY",i+1)) +#define HELP_TEXT THEME->GetMetric("ScreenSelectMode","HelpText") +#define TIMER_SECONDS THEME->GetMetricI("ScreenSelectMode","TimerSeconds") +#define NEXT_SCREEN THEME->GetMetric("ScreenSelectMode","NextScreen") +#define SCROLLING_ELEMENT_SPACING THEME->GetMetricI("ScreenSelectMode","ScrollingElementSpacing") +#define SCROLLING_LIST_X THEME->GetMetricF("ScreenSelectMode","ScrollingListX") +#define SCROLLING_LIST_Y THEME->GetMetricF("ScreenSelectMode","ScrollingListY") +#define SELECTION_SPECIFIC_BG_ANIMATIONS THEME->GetMetricB("ScreenSelectMode","SelectionSpecificBGAnimations") +#define BOUNCE_JOIN_MESSAGE THEME->GetMetricB("ScreenSelectMode","BounceJoinMessage") +#define FOLD_ON_JOIN THEME->GetMetricB("ScreenSelectMode","FoldOnJoin") const float TWEEN_TIME = 0.35f; @@ -57,35 +59,48 @@ ScreenSelectMode::ScreenSelectMode() /*********** TODO: MAKE THIS WORK FOR ALL GAME STYLES! *************/ - m_StyleListFrame.Load( THEME->GetPathTo("Graphics","StyleListFrame")); - m_StyleListFrame.SetXY( SCROLLING_LIST_X, SCROLLING_LIST_Y); - this->AddChild( &m_StyleListFrame ); + m_ChoiceListFrame.Load( THEME->GetPathTo("Graphics","select mode list frame")); + m_ChoiceListFrame.SetXY( SCROLLING_LIST_X, SCROLLING_LIST_Y); + this->AddChild( &m_ChoiceListFrame ); m_ScrollingList.SetXY( CENTER_X, SCROLLING_LIST_Y ); m_ScrollingList.SetSpacing( SCROLLING_ELEMENT_SPACING ); m_ScrollingList.SetNumberVisible( 9 ); this->AddChild( &m_ScrollingList ); - m_SelectedStyleFrame.Load( THEME->GetPathTo("Graphics","SelectedStyleFrame")); - m_SelectedStyleFrame.SetXY( CENTER_X, SCROLLING_LIST_Y); - this->AddChild( &m_SelectedStyleFrame ); + m_ChoiceListHighlight.Load( THEME->GetPathTo("Graphics","select mode list highlight")); + m_ChoiceListHighlight.SetXY( CENTER_X, SCROLLING_LIST_Y); + this->AddChild( &m_ChoiceListHighlight ); for( int p=0; pGetPathTo("Graphics",ssprintf("select player controller selected p%d", p+1)) ); - m_sprControllers[p].SetXY( CONTROLLER_X(p), CONTROLLER_Y(p) ); - this->AddChild( &m_sprControllers[p] ); - - if( GAMESTATE->m_bSideIsJoined[p] ) // if side is already joined - continue; // don't show bobbing join and blob + m_sprJoinFrame[p].Load( THEME->GetPathTo("Graphics","select player join frame 1x2") ); + m_sprJoinFrame[p].StopAnimating(); + m_sprJoinFrame[p].SetState( p ); + m_sprJoinFrame[p].SetXY( JOIN_FRAME_X(p), JOIN_FRAME_Y(p) ); + this->AddChild( &m_sprJoinFrame[p] ); - m_sprControllers[p].Load( THEME->GetPathTo("Graphics",ssprintf("select player controller p%d", p+1)) ); + if( GAMESTATE->m_bSideIsJoined[p] ) + m_sprJoinFrame[p].SetZoomY( 0 ); - m_sprCursors[p].Load( THEME->GetPathTo("Graphics",ssprintf("select player cursor p%d",p+1)) ); - m_sprCursors[p].SetXY( CURSOR_X(p), CURSOR_Y(p) ); - m_sprCursors[p].SetEffectBouncing( D3DXVECTOR3(0,10,0), 0.5f ); - this->AddChild( &m_sprCursors[p] ); + m_sprJoinMessage[p].Load( THEME->GetPathTo("Graphics","select player join message 2x2") ); + m_sprJoinMessage[p].StopAnimating(); + m_sprJoinMessage[p].SetState( p ); + m_sprJoinMessage[p].SetXY( JOIN_MESSAGE_X(p), JOIN_MESSAGE_Y(p) ); + if( BOUNCE_JOIN_MESSAGE ) + m_sprJoinMessage[p].SetEffectBouncing( D3DXVECTOR3(0,10,0), 0.5f ); + this->AddChild( &m_sprJoinMessage[p] ); + + if( GAMESTATE->m_bSideIsJoined[p] ) + { + m_sprJoinMessage[p].SetState( p+NUM_PLAYERS ); + + if( FOLD_ON_JOIN ) + { + m_sprJoinMessage[p].SetZoomY( 0 ); + m_sprJoinFrame[p].SetZoomY( 0 ); + } + } } @@ -199,7 +214,7 @@ void ScreenSelectMode::RefreshModeChoices() const ModeChoice& choice = m_aPossibleModeChoices[i]; if( choice.numSidesJoinedToPlay == iNumSidesJoined ) - asGraphicPaths.Add( THEME->GetPathTo("Graphics", ssprintf("select mode %s %s", sGameName, choice.name) ) ); + asGraphicPaths.Add( THEME->GetPathTo("Graphics", ssprintf("select mode choice %s %s", sGameName, choice.name) ) ); } m_ScrollingList.Load( asGraphicPaths ); @@ -276,12 +291,16 @@ void ScreenSelectMode::MenuStart( PlayerNumber pn ) GAMESTATE->m_bSideIsJoined[pn] = true; SCREENMAN->RefreshCreditsMessages(); m_soundSelect.Play(); - m_sprCursors[pn].BeginTweening( 0.25f ); - m_sprCursors[pn].SetTweenZoomY( 0 ); - //m_sprControllers[pn].BeginTweening( 0.25f ); - //m_sprControllers[pn].SetTweenZoomY( 0 ); - // NOW replace with the new controller! - m_sprControllers[pn].Load( THEME->GetPathTo("Graphics",ssprintf("select player controller selected p%d", pn+1)) ); + + m_sprJoinMessage[pn].SetState( pn + NUM_PLAYERS ); + + if( FOLD_ON_JOIN ) + { + m_sprJoinMessage[pn].BeginTweening( 0.25f ); + m_sprJoinMessage[pn].SetTweenZoomY( 0 ); + m_sprJoinFrame[pn].BeginTweening( 0.25f ); + m_sprJoinFrame[pn].SetTweenZoomY( 0 ); + } RefreshModeChoices(); @@ -315,15 +334,15 @@ void ScreenSelectMode::TweenOnScreen() float fOriginalX; - fOriginalX = m_sprCursors[p].GetX(); - m_sprCursors[p].SetX( m_sprCursors[p].GetX()+fOffScreenOffset ); - m_sprCursors[p].BeginTweening( 0.5f, Actor::TWEEN_BOUNCE_END ); - m_sprCursors[p].SetTweenX( fOriginalX ); + fOriginalX = m_sprJoinMessage[p].GetX(); + m_sprJoinMessage[p].SetX( m_sprJoinMessage[p].GetX()+fOffScreenOffset ); + m_sprJoinMessage[p].BeginTweening( 0.5f, Actor::TWEEN_BOUNCE_END ); + m_sprJoinMessage[p].SetTweenX( fOriginalX ); - fOriginalX = m_sprControllers[p].GetX(); - m_sprControllers[p].SetX( m_sprCursors[p].GetX()+fOffScreenOffset ); - m_sprControllers[p].BeginTweening( 0.5f, Actor::TWEEN_BOUNCE_END ); - m_sprControllers[p].SetTweenX( fOriginalX ); + fOriginalX = m_sprJoinFrame[p].GetX(); + m_sprJoinFrame[p].SetX( m_sprJoinMessage[p].GetX()+fOffScreenOffset ); + m_sprJoinFrame[p].BeginTweening( 0.5f, Actor::TWEEN_BOUNCE_END ); + m_sprJoinFrame[p].SetTweenX( fOriginalX ); } } @@ -336,9 +355,9 @@ void ScreenSelectMode::TweenOffScreen() { float fOffScreenOffset = float( (p==PLAYER_1) ? -SCREEN_WIDTH : +SCREEN_WIDTH ); - m_sprCursors[p].BeginTweening( 0.5f, Actor::TWEEN_BIAS_END ); - m_sprCursors[p].SetTweenX( m_sprCursors[p].GetX()+fOffScreenOffset ); - m_sprControllers[p].BeginTweening( 0.5f, Actor::TWEEN_BIAS_END ); - m_sprControllers[p].SetTweenX( m_sprCursors[p].GetX()+fOffScreenOffset ); + m_sprJoinMessage[p].BeginTweening( 0.5f, Actor::TWEEN_BIAS_END ); + m_sprJoinMessage[p].SetTweenX( m_sprJoinMessage[p].GetX()+fOffScreenOffset ); + m_sprJoinFrame[p].BeginTweening( 0.5f, Actor::TWEEN_BIAS_END ); + m_sprJoinFrame[p].SetTweenX( m_sprJoinMessage[p].GetX()+fOffScreenOffset ); } } diff --git a/stepmania/src/ScreenSelectMode.h b/stepmania/src/ScreenSelectMode.h index db8a271e18..0f4e5b037a 100644 --- a/stepmania/src/ScreenSelectMode.h +++ b/stepmania/src/ScreenSelectMode.h @@ -48,10 +48,10 @@ protected: void TweenOffScreen(); void TweenOnScreen(); - Sprite m_sprCursors[NUM_PLAYERS]; - Sprite m_sprControllers[NUM_PLAYERS]; - Sprite m_StyleListFrame; - Sprite m_SelectedStyleFrame; + Sprite m_sprJoinMessage[NUM_PLAYERS]; + Sprite m_sprJoinFrame[NUM_PLAYERS]; + Sprite m_ChoiceListFrame; + Sprite m_ChoiceListHighlight; CArray m_aPossibleModeChoices;