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

clean up difficulty steps description

Browse Source
This commit is contained in:
Chris Danford
2005-03-06 00:08:48 +00:00
parent 0091b6d1d4
commit a83f462b9f
3 changed files with 33 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/EditMenu.cpp
+18 -8
View File
@@ -139,7 +139,7 @@ EditMenu::~EditMenu()
} }
void EditMenu::RefreshSteps() void EditMenu::RefreshAll()
{ {
OnRowValueChanged( ROW_SONG ); OnRowValueChanged( ROW_SONG );
} }
@@ -278,16 +278,18 @@ void EditMenu::OnRowValueChanged( Row row )
// fall through // fall through
case ROW_STEPS: case ROW_STEPS:
{ {
CString s = DifficultyToThemedString(GetSelectedDifficulty()); CString s;
Steps *pSteps = GetSelectedSteps(); Steps *pSteps = GetSelectedSteps();
if( pSteps && GetSelectedDifficulty() == DIFFICULTY_EDIT ) if( pSteps && GetSelectedDifficulty() == DIFFICULTY_EDIT )
s += " - " + pSteps->GetDescription(); s = pSteps->GetDescription() + " (" + DifficultyToThemedString(DIFFICULTY_EDIT) + ")";
m_textValue[ROW_STEPS].SetText( s );
if( GetSelectedSteps() )
m_Meter.SetFromSteps( GetSelectedSteps() );
else else
m_Meter.SetFromMeterAndDifficulty( 0, GetSelectedDifficulty() ); s = DifficultyToThemedString(GetSelectedDifficulty());
m_textValue[ROW_STEPS].SetText( s );
} }
if( GetSelectedSteps() )
m_Meter.SetFromSteps( GetSelectedSteps() );
else
m_Meter.SetFromMeterAndDifficulty( 0, GetSelectedDifficulty() );
// fall through // fall through
case ROW_SOURCE_STEPS_TYPE: case ROW_SOURCE_STEPS_TYPE:
m_textLabel[ROW_SOURCE_STEPS_TYPE].SetHidden( GetSelectedSteps() ? true : false ); m_textLabel[ROW_SOURCE_STEPS_TYPE].SetHidden( GetSelectedSteps() ? true : false );
@@ -310,7 +312,15 @@ void EditMenu::OnRowValueChanged( Row row )
case ROW_SOURCE_STEPS: case ROW_SOURCE_STEPS:
m_textLabel[ROW_SOURCE_STEPS].SetHidden( GetSelectedSteps() ? true : false ); m_textLabel[ROW_SOURCE_STEPS].SetHidden( GetSelectedSteps() ? true : false );
m_textValue[ROW_SOURCE_STEPS].SetHidden( GetSelectedSteps() ? true : false ); m_textValue[ROW_SOURCE_STEPS].SetHidden( GetSelectedSteps() ? true : false );
m_textValue[ROW_SOURCE_STEPS].SetText( DifficultyToThemedString(GetSelectedSourceDifficulty()) ); {
CString s;
Steps *pSourceSteps = GetSelectedSourceSteps();
if( pSourceSteps && GetSelectedSourceDifficulty() == DIFFICULTY_EDIT )
s = pSourceSteps->GetDescription() + " (" + DifficultyToThemedString(DIFFICULTY_EDIT) + ")";
else
s = DifficultyToThemedString(GetSelectedSourceDifficulty());
m_textValue[ROW_SOURCE_STEPS].SetText( s );
}
if( GetSelectedSourceSteps() ) if( GetSelectedSourceSteps() )
m_SourceMeter.SetFromSteps( GetSelectedSourceSteps() ); m_SourceMeter.SetFromSteps( GetSelectedSourceSteps() );
else else
stepmania/src/EditMenu.h
+1 -1
View File
@@ -76,7 +76,7 @@ public:
return s[a]; return s[a];
} }
void RefreshSteps(); void RefreshAll();
CString GetSelectedGroup() const { ASSERT(m_iSelection[ROW_GROUP] < (int)m_sGroups.size()); return m_sGroups[m_iSelection[ROW_GROUP]]; } CString GetSelectedGroup() const { ASSERT(m_iSelection[ROW_GROUP] < (int)m_sGroups.size()); return m_sGroups[m_iSelection[ROW_GROUP]]; }
stepmania/src/ScreenEditMenu.cpp
+14 -6
View File
@@ -54,7 +54,7 @@ void ScreenEditMenu::HandleScreenMessage( const ScreenMessage SM )
switch( SM ) switch( SM )
{ {
case SM_RefreshSelector: case SM_RefreshSelector:
m_Selector.RefreshSteps(); m_Selector.RefreshAll();
break; break;
case SM_GoToPrevScreen: case SM_GoToPrevScreen:
SCREENMAN->SetNewScreen( PREV_SCREEN ); SCREENMAN->SetNewScreen( PREV_SCREEN );
@@ -103,7 +103,7 @@ static CString GetCopyDescription( const Steps *pSourceSteps )
s = pSourceSteps->GetDescription(); s = pSourceSteps->GetDescription();
else else
s = DifficultyToThemedString( pSourceSteps->GetDifficulty() ); s = DifficultyToThemedString( pSourceSteps->GetDifficulty() );
return "From " + s; return s;
} }
void ScreenEditMenu::MenuStart( PlayerNumber pn ) void ScreenEditMenu::MenuStart( PlayerNumber pn )
@@ -146,7 +146,7 @@ void ScreenEditMenu::MenuStart( PlayerNumber pn )
case EditMenu::ACTION_DELETE: case EditMenu::ACTION_DELETE:
ASSERT( pSteps ); ASSERT( pSteps );
SCREENMAN->Prompt( SM_RefreshSelector, "These steps will be lost permanently.\n\nContinue with delete?", true, false, DeleteCurSteps ); SCREENMAN->Prompt( SM_RefreshSelector, "These steps will be lost permanently.\n\nContinue with delete?", true, false, DeleteCurSteps );
m_Selector.RefreshSteps(); m_Selector.RefreshAll();
return; return;
case EditMenu::ACTION_COPY: case EditMenu::ACTION_COPY:
ASSERT( !pSteps ); ASSERT( !pSteps );
@@ -162,8 +162,12 @@ void ScreenEditMenu::MenuStart( PlayerNumber pn )
SCREENMAN->SystemMessage( "Steps created from copy." ); SCREENMAN->SystemMessage( "Steps created from copy." );
SOUND->PlayOnce( THEME->GetPathS(m_sName,"create") ); SOUND->PlayOnce( THEME->GetPathS(m_sName,"create") );
m_Selector.RefreshSteps();
pSong->Save(); pSong->Save();
GAMESTATE->m_pCurSong.Set( pSong );
GAMESTATE->m_pCurSteps[0].Set( pNewSteps );
m_Selector.RefreshAll();
} }
return; return;
case EditMenu::ACTION_AUTOGEN: case EditMenu::ACTION_AUTOGEN:
@@ -181,8 +185,12 @@ void ScreenEditMenu::MenuStart( PlayerNumber pn )
SCREENMAN->SystemMessage( "Steps created from AutoGen." ); SCREENMAN->SystemMessage( "Steps created from AutoGen." );
SOUND->PlayOnce( THEME->GetPathS(m_sName,"create") ); SOUND->PlayOnce( THEME->GetPathS(m_sName,"create") );
m_Selector.RefreshSteps();
pSong->Save(); pSong->Save();
GAMESTATE->m_pCurSong.Set( pSong );
GAMESTATE->m_pCurSteps[0].Set( pNewSteps );
m_Selector.RefreshAll();
} }
return; return;
case EditMenu::ACTION_BLANK: case EditMenu::ACTION_BLANK:
@@ -199,7 +207,7 @@ void ScreenEditMenu::MenuStart( PlayerNumber pn )
SCREENMAN->SystemMessage( "Blank Steps created." ); SCREENMAN->SystemMessage( "Blank Steps created." );
SOUND->PlayOnce( THEME->GetPathS(m_sName,"create") ); SOUND->PlayOnce( THEME->GetPathS(m_sName,"create") );
m_Selector.RefreshSteps(); m_Selector.RefreshAll();
pSong->Save(); pSong->Save();
} }
return; return;