From e805f09b3c03ae74e1c279d08409623fe9bb046a Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Thu, 14 Jul 2005 21:51:22 +0000 Subject: [PATCH] SharedPreviewAndCursor -> SharedSelection --- stepmania/Themes/default/metrics.ini | 28 +++++++++++++--------- stepmania/src/ScreenSelectMaster.cpp | 34 +++++++++++++-------------- stepmania/src/ScreenSelectMaster.h | 2 +- stepmania/src/ScreenSelectProfile.cpp | 15 ++++++------ 4 files changed, 43 insertions(+), 36 deletions(-) diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 693a5f4219..9203fc69a9 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -60,7 +60,7 @@ Class=ScreenTitleMenu Fallback=ScreenSelectMasterBlank PrevScreen=ScreenCompany CoinModeChangeScreen=@ScreenTitleBranch() -SharedPreviewAndCursor=1 +SharedSelection=1 AllowDisabledPlayerInput=1 OverrideLockInputSeconds=1 LockInputSeconds=0 @@ -2933,7 +2933,7 @@ AllowRepeatingInput=0 PreSwitchPageSeconds=0 PostSwitchPageSeconds=0 ScrollerSecondsPerItem=0 -ScrollerNumItemsToDraw=0 +ScrollerNumItemsToDraw=20 ScrollerTransform=function(self,offset,itemIndex,numItems) end OverrideLockInputSeconds=0 LockInputSeconds=0 @@ -2952,7 +2952,7 @@ WrapScroller=0 ScrollerFastCatchup=0 # All on page 1 by default. NumChoicesOnPage1=999 -SharedPreviewAndCursor=1 +SharedSelection=1 CursorP1OffsetXFromIcon=0 CursorP1OffsetYFromIcon=0 CursorP2OffsetXFromIcon=0 @@ -3170,7 +3170,7 @@ LockInputSeconds=0 PreSwitchPageSeconds=0 PostSwitchPageSeconds=0 ScrollerSecondsPerItem=0 -ScrollerNumItemsToDraw=0 +ScrollerNumItemsToDraw=20 ScrollerTransform=function(self,offset,itemIndex,numItems) end StyleIcon=1 OverrideSleepAfterTweenOffSeconds=0 @@ -3188,7 +3188,7 @@ WrapScroller=0 ScrollerFastCatchup=0 # All on page 1 by default. NumChoicesOnPage1=999 -SharedPreviewAndCursor=1 +SharedSelection=1 CursorP1OffsetXFromIcon=0 CursorP1OffsetYFromIcon=0 CursorP2OffsetXFromIcon=0 @@ -4486,13 +4486,19 @@ AllowRepeatingInput=1 ChoiceNames= CodeNames= -ShowIcon=1 -ShowScroller=0 +ShowIcon=0 +ShowCursor=0 +ShowScroller=1 +ScrollerX=SCREEN_CENTER_X-250 +ScrollerY=0 +ScrollerOnCommand= +ScrollerOffCommand= +ScrollerTransform=function(self,offset,itemIndex,numItems) if itemIndex==numItems-1 then self:y(SCREEN_BOTTOM-100) else if itemIndex>4 then itemIndex = itemIndex-4; self:x(280); end self:y(SCREEN_TOP+100+50*itemIndex) end end -IconChoiceCreateX=100 -IconChoiceCreateY=100 -IconChoiceProfile01X=100 -IconChoiceProfile01=100 +OptionOrderLeft=1:1,2:6,6:2,3:7,7:3,4:8,8:4,5:9,9:5,10:10 +OptionOrderRight=1:1,2:6,6:2,3:7,7:3,4:8,8:4,5:9,9:5,10:10 +OptionOrderDown=1:2,2:3,3:4,4:5,5:10,6:7,7:8,8:9,9:10,10:1 +OptionOrderUp=10:5,5:4,4:3,3:2,2:1,1:10,9:8,7:8,7:6,6:1 [ScreenSelectProfileManage] Fallback=ScreenSelectProfile diff --git a/stepmania/src/ScreenSelectMaster.cpp b/stepmania/src/ScreenSelectMaster.cpp index 4f419323c6..a3f7442846 100644 --- a/stepmania/src/ScreenSelectMaster.cpp +++ b/stepmania/src/ScreenSelectMaster.cpp @@ -26,7 +26,7 @@ ScreenSelectMaster::ScreenSelectMaster( CString sClassName ) : ScreenSelect( sCl SHOW_ICON(m_sName,"ShowIcon"), SHOW_CURSOR(m_sName,"ShowCursor"), SHOW_SCROLLER(m_sName,"ShowScroller"), - SHARED_PREVIEW_AND_CURSOR(m_sName,"SharedPreviewAndCursor"), + SHARED_SELECTION(m_sName,"SharedSelection"), NUM_CHOICES_ON_PAGE_1(m_sName,"NumChoicesOnPage1"), CURSOR_OFFSET_X_FROM_ICON(m_sName,CURSOR_OFFSET_X_FROM_ICON_NAME,NUM_PLAYERS), CURSOR_OFFSET_Y_FROM_ICON(m_sName,CURSOR_OFFSET_Y_FROM_ICON_NAME,NUM_PLAYERS), @@ -73,7 +73,7 @@ void ScreenSelectMaster::Init() vector vpns; - if( SHARED_PREVIEW_AND_CURSOR ) + if( SHARED_SELECTION ) { vpns.push_back( (PlayerNumber)0 ); } @@ -83,8 +83,8 @@ void ScreenSelectMaster::Init() vpns.push_back( p ); } -#define PLAYER_APPEND_WITH_SPACE(p) (SHARED_PREVIEW_AND_CURSOR ? CString() : ssprintf(" P%d",(p)+1)) -#define PLAYER_APPEND_NO_SPACE(p) (SHARED_PREVIEW_AND_CURSOR ? CString() : ssprintf("P%d",(p)+1)) +#define PLAYER_APPEND_WITH_SPACE(p) (SHARED_SELECTION ? CString() : ssprintf(" P%d",(p)+1)) +#define PLAYER_APPEND_NO_SPACE(p) (SHARED_SELECTION ? CString() : ssprintf("P%d",(p)+1)) // init cursor if( SHOW_CURSOR ) @@ -249,7 +249,7 @@ void ScreenSelectMaster::HandleScreenMessage( const ScreenMessage SM ) vector vpns; - if( SHARED_PREVIEW_AND_CURSOR ) + if( SHARED_SELECTION ) { vpns.push_back( (PlayerNumber)0 ); } @@ -322,7 +322,7 @@ int ScreenSelectMaster::GetSelectionIndex( PlayerNumber pn ) void ScreenSelectMaster::UpdateSelectableChoices() { vector vpns; - if( SHARED_PREVIEW_AND_CURSOR ) + if( SHARED_SELECTION ) { vpns.push_back( (PlayerNumber)0 ); } @@ -457,7 +457,7 @@ bool ScreenSelectMaster::ChangePage( int iNewChoice ) vector vpns; - if( SHARED_PREVIEW_AND_CURSOR ) + if( SHARED_SELECTION ) { vpns.push_back( (PlayerNumber)0 ); } @@ -485,7 +485,7 @@ bool ScreenSelectMaster::ChangePage( int iNewChoice ) if( SHOW_SCROLLER ) { - if( SHARED_PREVIEW_AND_CURSOR ) + if( SHARED_SELECTION ) { int iChoice = m_iChoice[GetSharedPlayer()]; COMMAND( m_sprScroll[iChoice][0], "PreSwitchPage" ); @@ -540,7 +540,7 @@ bool ScreenSelectMaster::ChangeSelection( PlayerNumber pn, MenuDir dir, int iNew const int iOldChoice = m_iChoice[p]; /* Set the new m_iChoice even for disabled players, since a player might - * join on a SHARED_PREVIEW_AND_CURSOR after the cursor has been moved. */ + * join on a SHARED_SELECTION after the cursor has been moved. */ m_iChoice[p] = iNewChoice; if( p!=pn ) @@ -556,7 +556,7 @@ bool ScreenSelectMaster::ChangeSelection( PlayerNumber pn, MenuDir dir, int iNew if( SHOW_CURSOR ) { - if( SHARED_PREVIEW_AND_CURSOR ) + if( SHARED_SELECTION ) { COMMAND( m_sprCursor[0], "Change" ); m_sprCursor[0]->SetXY( GetCursorX((PlayerNumber)0), GetCursorY((PlayerNumber)0) ); @@ -579,7 +579,7 @@ bool ScreenSelectMaster::ChangeSelection( PlayerNumber pn, MenuDir dir, int iNew if( iPressedDir != iActualDir ) // wrapped { - ActorScroller &scroller = SHARED_PREVIEW_AND_CURSOR ? m_Scroller[0] : m_Scroller[p]; + ActorScroller &scroller = SHARED_SELECTION ? m_Scroller[0] : m_Scroller[p]; float fItem = scroller.GetCurrentItem(); int iNumChoices = m_aGameCommands.size(); fItem += iActualDir * iNumChoices; @@ -587,12 +587,12 @@ bool ScreenSelectMaster::ChangeSelection( PlayerNumber pn, MenuDir dir, int iNew } } - if( SHARED_PREVIEW_AND_CURSOR ) + if( SHARED_SELECTION ) m_Scroller[0].SetDestinationItem( (float)iNewChoice ); else m_Scroller[p].SetDestinationItem( (float)iNewChoice ); - if( SHARED_PREVIEW_AND_CURSOR ) + if( SHARED_SELECTION ) { m_sprScroll[iOldChoice][0]->PlayCommand( "LoseFocus" ); m_sprScroll[iNewChoice][0]->PlayCommand( "GainFocus" ); @@ -654,7 +654,7 @@ float ScreenSelectMaster::DoMenuStart( PlayerNumber pn ) fSecs = max( fSecs, m_sprMore[page]->GetTweenTimeLeft() ); } - int iIndex = SHARED_PREVIEW_AND_CURSOR ? 0 : pn; + int iIndex = SHARED_SELECTION ? 0 : pn; if( SHOW_CURSOR ) { @@ -704,7 +704,7 @@ void ScreenSelectMaster::MenuStart( PlayerNumber pn ) float fSecs = 0; bool bAllDone = true; - if( (bool)SHARED_PREVIEW_AND_CURSOR || GetCurrentPage() == PAGE_2 ) + if( (bool)SHARED_SELECTION || GetCurrentPage() == PAGE_2 ) { /* Only one player has to pick. Choose this for all the other players, too. */ FOREACH_PlayerNumber( p ) @@ -740,7 +740,7 @@ void ScreenSelectMaster::MenuStart( PlayerNumber pn ) void ScreenSelectMaster::TweenOnScreen() { vector vpns; - if( SHARED_PREVIEW_AND_CURSOR ) + if( SHARED_SELECTION ) { vpns.push_back( (PlayerNumber)0 ); } @@ -806,7 +806,7 @@ void ScreenSelectMaster::TweenOnScreen() void ScreenSelectMaster::TweenOffScreen() { vector vpns; - if( SHARED_PREVIEW_AND_CURSOR ) + if( SHARED_SELECTION ) { vpns.push_back( (PlayerNumber)0 ); } diff --git a/stepmania/src/ScreenSelectMaster.h b/stepmania/src/ScreenSelectMaster.h index 17db21cf33..e2afd3100d 100644 --- a/stepmania/src/ScreenSelectMaster.h +++ b/stepmania/src/ScreenSelectMaster.h @@ -36,7 +36,7 @@ protected: ThemeMetric SHOW_ICON; ThemeMetric SHOW_CURSOR; ThemeMetric SHOW_SCROLLER; - ThemeMetric SHARED_PREVIEW_AND_CURSOR; + ThemeMetric SHARED_SELECTION; ThemeMetric NUM_CHOICES_ON_PAGE_1; ThemeMetric1D CURSOR_OFFSET_X_FROM_ICON; ThemeMetric1D CURSOR_OFFSET_Y_FROM_ICON; diff --git a/stepmania/src/ScreenSelectProfile.cpp b/stepmania/src/ScreenSelectProfile.cpp index 4e5a079708..a8ccf4c898 100644 --- a/stepmania/src/ScreenSelectProfile.cpp +++ b/stepmania/src/ScreenSelectProfile.cpp @@ -28,18 +28,19 @@ void ScreenSelectProfile::Init() int iIndex = 0; m_aGameCommands.clear(); - gc.Load( iIndex++, ParseCommands("name,create") ); + gc.Load( iIndex++, ParseCommands("name,Create") ); m_aGameCommands.push_back( gc ); - vector vProfileIDs; - PROFILEMAN->GetLocalProfileIDs( vProfileIDs ); - FOREACH_CONST( CString, vProfileIDs, s ) + vector vsProfileID; + PROFILEMAN->GetLocalProfileIDs( vsProfileID ); + FOREACH_CONST( CString, vsProfileID, s ) { - gc.Load( iIndex++, ParseCommands("name,profile;profileid," + *s + ";screen," + NEXT_SCREEN.GetValue()) ); + CString sCommand = ssprintf( "name,Profile;profileid,%s;screen,%s", s->c_str(), NEXT_SCREEN.GetValue().c_str() ); + gc.Load( iIndex++, ParseCommands(sCommand) ); m_aGameCommands.push_back( gc ); } - gc.Load( iIndex++, ParseCommands("name,exit") ); + gc.Load( iIndex++, ParseCommands("name,Exit") ); m_aGameCommands.push_back( gc ); @@ -88,7 +89,7 @@ void ScreenSelectProfile::HandleScreenMessage( const ScreenMessage SM ) // create bool bResult = PROFILEMAN->CreateLocalProfile( sNewName ); if( bResult ) - SCREENMAN->SetNewScreen( m_sName ); // reload + SCREENMAN->SetNewScreen( NEXT_SCREEN ); else ScreenPrompt::Prompt( SM_None, ssprintf("Error creating profile '%s'.", sNewName.c_str()) ); }