Before/AfterRowChange -> ChangeSelectedRow
This commit is contained in:
@@ -100,8 +100,7 @@ ScreenEditMenu::ScreenEditMenu()
|
|||||||
|
|
||||||
|
|
||||||
// data structures
|
// data structures
|
||||||
m_SelectedRow = ROW_GROUP;
|
ChangeSelectedRow(ROW_GROUP);
|
||||||
AfterRowChange();
|
|
||||||
|
|
||||||
SONGMAN->GetGroupNames( m_sGroups );
|
SONGMAN->GetGroupNames( m_sGroups );
|
||||||
GAMEMAN->GetNotesTypesForGame( GAMESTATE->m_CurGame, m_NotesTypes );
|
GAMEMAN->GetNotesTypesForGame( GAMESTATE->m_CurGame, m_NotesTypes );
|
||||||
@@ -216,17 +215,16 @@ void ScreenEditMenu::HandleScreenMessage( const ScreenMessage SM )
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void ScreenEditMenu::BeforeRowChange()
|
void ScreenEditMenu::ChangeSelectedRow( SelectedRow row )
|
||||||
{
|
{
|
||||||
m_textGroup.SetEffectNone();
|
m_textGroup.SetEffectNone();
|
||||||
m_sprArrowLeft.SetDiffuseColor( D3DXCOLOR(1,1,1,0) );
|
m_sprArrowLeft.SetDiffuseColor( D3DXCOLOR(1,1,1,0) );
|
||||||
m_sprArrowRight.SetDiffuseColor( D3DXCOLOR(1,1,1,0) );
|
m_sprArrowRight.SetDiffuseColor( D3DXCOLOR(1,1,1,0) );
|
||||||
m_textNotesType.SetEffectNone();
|
m_textNotesType.SetEffectNone();
|
||||||
m_textNotes.SetEffectNone();
|
m_textNotes.SetEffectNone();
|
||||||
}
|
|
||||||
|
|
||||||
void ScreenEditMenu::AfterRowChange()
|
m_SelectedRow = row;
|
||||||
{
|
|
||||||
switch( m_SelectedRow )
|
switch( m_SelectedRow )
|
||||||
{
|
{
|
||||||
case ROW_GROUP: m_textGroup.SetEffectGlowing(); break;
|
case ROW_GROUP: m_textGroup.SetEffectGlowing(); break;
|
||||||
@@ -295,9 +293,7 @@ void ScreenEditMenu::MenuUp( const PlayerNumber p )
|
|||||||
if( m_SelectedRow == 0 ) // can't go up any further
|
if( m_SelectedRow == 0 ) // can't go up any further
|
||||||
return;
|
return;
|
||||||
|
|
||||||
BeforeRowChange();
|
ChangeSelectedRow(SelectedRow(m_SelectedRow-1));
|
||||||
m_SelectedRow = SelectedRow(m_SelectedRow-1);
|
|
||||||
AfterRowChange();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void ScreenEditMenu::MenuDown( const PlayerNumber p )
|
void ScreenEditMenu::MenuDown( const PlayerNumber p )
|
||||||
@@ -305,9 +301,7 @@ void ScreenEditMenu::MenuDown( const PlayerNumber p )
|
|||||||
if( m_SelectedRow == NUM_ROWS-1 ) // can't go down any further
|
if( m_SelectedRow == NUM_ROWS-1 ) // can't go down any further
|
||||||
return;
|
return;
|
||||||
|
|
||||||
BeforeRowChange();
|
ChangeSelectedRow(SelectedRow(m_SelectedRow+1));
|
||||||
m_SelectedRow = SelectedRow(m_SelectedRow+1);
|
|
||||||
AfterRowChange();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void ScreenEditMenu::MenuLeft( const PlayerNumber p )
|
void ScreenEditMenu::MenuLeft( const PlayerNumber p )
|
||||||
|
|||||||
@@ -33,9 +33,6 @@ public:
|
|||||||
virtual void HandleScreenMessage( const ScreenMessage SM );
|
virtual void HandleScreenMessage( const ScreenMessage SM );
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void BeforeRowChange();
|
|
||||||
void AfterRowChange();
|
|
||||||
|
|
||||||
void OnGroupChange();
|
void OnGroupChange();
|
||||||
void OnSongChange();
|
void OnSongChange();
|
||||||
void OnNotesTypeChange();
|
void OnNotesTypeChange();
|
||||||
@@ -86,6 +83,7 @@ private:
|
|||||||
RandomSample m_soundChangeMusic;
|
RandomSample m_soundChangeMusic;
|
||||||
RandomSample m_soundSelect;
|
RandomSample m_soundSelect;
|
||||||
|
|
||||||
|
void ChangeSelectedRow( SelectedRow row );
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user