actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Add EnabledCommand, DisabledCommand. Const fix, simplify.

Browse Source
This commit is contained in:
Glenn Maynard
2003-11-10 21:18:26 +00:00
parent bbbfd4a223
commit 0fd7734c93
2 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenSelectMaster.cpp
+6 -16
View File
@@ -29,7 +29,6 @@
#define NUM_CHOICES_ON_PAGE_1 THEME->GetMetricI(m_sName,"NumChoicesOnPage1") #define NUM_CHOICES_ON_PAGE_1 THEME->GetMetricI(m_sName,"NumChoicesOnPage1")
#define CURSOR_OFFSET_X_FROM_ICON( p, part ) THEME->GetMetricF(m_sName,ssprintf("CursorPart%dP%dOffsetXFromIcon",part+1,p+1)) #define CURSOR_OFFSET_X_FROM_ICON( p, part ) THEME->GetMetricF(m_sName,ssprintf("CursorPart%dP%dOffsetXFromIcon",part+1,p+1))
#define CURSOR_OFFSET_Y_FROM_ICON( p, part ) THEME->GetMetricF(m_sName,ssprintf("CursorPart%dP%dOffsetYFromIcon",part+1,p+1)) #define CURSOR_OFFSET_Y_FROM_ICON( p, part ) THEME->GetMetricF(m_sName,ssprintf("CursorPart%dP%dOffsetYFromIcon",part+1,p+1))
#define DISABLED_COLOR THEME->GetMetricC(m_sName,"DisabledColor")
#define PRE_SWITCH_PAGE_SECONDS THEME->GetMetricF(m_sName,"PreSwitchPageSeconds") #define PRE_SWITCH_PAGE_SECONDS THEME->GetMetricF(m_sName,"PreSwitchPageSeconds")
#define POST_SWITCH_PAGE_SECONDS THEME->GetMetricF(m_sName,"PostSwitchPageSeconds") #define POST_SWITCH_PAGE_SECONDS THEME->GetMetricF(m_sName,"PostSwitchPageSeconds")
@@ -203,17 +202,9 @@ int ScreenSelectMaster::GetSelectionIndex( PlayerNumber pn )
void ScreenSelectMaster::UpdateSelectableChoices() void ScreenSelectMaster::UpdateSelectableChoices()
{ {
/* XXX: If a player joins during the tween-in, this diffuse change
* will be undone by the tween. Hmm. */
for( unsigned c=0; c<m_aModeChoices.size(); c++ ) for( unsigned c=0; c<m_aModeChoices.size(); c++ )
{
if( m_aModeChoices[c].IsPlayable() )
for( int i=0; i<NUM_ICON_PARTS; i++ ) for( int i=0; i<NUM_ICON_PARTS; i++ )
m_sprIcon[i][c]->SetDiffuse( RageColor(1,1,1,1) ); COMMAND( m_sprIcon[i][c], m_aModeChoices[c].IsPlayable()? "Enabled":"Disabled" );
else
for( int i=0; i<NUM_ICON_PARTS; i++ )
m_sprIcon[i][c]->SetDiffuse( DISABLED_COLOR );
}
for( int p=0; p<NUM_PLAYERS; p++ ) for( int p=0; p<NUM_PLAYERS; p++ )
{ {
@@ -397,15 +388,12 @@ bool ScreenSelectMaster::ChangeSelection( PlayerNumber pn, int iNewChoice )
return true; return true;
} }
ScreenSelectMaster::Page ScreenSelectMaster::GetPage( int iChoiceIndex ) ScreenSelectMaster::Page ScreenSelectMaster::GetPage( int iChoiceIndex ) const
{ {
if( iChoiceIndex < NUM_CHOICES_ON_PAGE_1 ) return iChoiceIndex < NUM_CHOICES_ON_PAGE_1? PAGE_1:PAGE_2;
return PAGE_1;
else
return PAGE_2;
} }
ScreenSelectMaster::Page ScreenSelectMaster::GetCurrentPage() ScreenSelectMaster::Page ScreenSelectMaster::GetCurrentPage() const
{ {
// Both players are guaranteed to be on the same page. // Both players are guaranteed to be on the same page.
return GetPage( m_iChoice[GAMESTATE->m_MasterPlayerNumber] ); return GetPage( m_iChoice[GAMESTATE->m_MasterPlayerNumber] );
@@ -431,6 +419,8 @@ void ScreenSelectMaster::MenuStart( PlayerNumber pn )
{ {
if( m_fLockInputSecs > 0 ) if( m_fLockInputSecs > 0 )
return; return;
if( m_bChosen[pn] == true )
return;
SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo(ssprintf("%s comment %s",m_sName.c_str(), m_aModeChoices[m_iChoice[pn]].m_sName.c_str())) ); SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo(ssprintf("%s comment %s",m_sName.c_str(), m_aModeChoices[m_iChoice[pn]].m_sName.c_str())) );
m_soundSelect.Play(); m_soundSelect.Play();
stepmania/src/ScreenSelectMaster.h
+2 -2
View File
@@ -39,8 +39,8 @@ public:
protected: protected:
enum Page { PAGE_1, PAGE_2, NUM_PAGES }; // on PAGE_2, cursors are locked together enum Page { PAGE_1, PAGE_2, NUM_PAGES }; // on PAGE_2, cursors are locked together
Page GetPage( int iChoiceIndex ); Page GetPage( int iChoiceIndex ) const;
Page GetCurrentPage(); Page GetCurrentPage() const;
virtual int GetSelectionIndex( PlayerNumber pn ); virtual int GetSelectionIndex( PlayerNumber pn );
virtual void UpdateSelectableChoices(); virtual void UpdateSelectableChoices();