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

don't show edit description in the item name (it's already in the difficulty meter)

Browse Source
This commit is contained in:
Chris Danford
2006-05-16 05:41:40 +00:00
parent 73d559156f
commit 721d2083b9
1 changed files with 14 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/EditMenu.cpp
+14 -27
View File
@@ -45,7 +45,7 @@ static RString ROW_Y_NAME( size_t i ) { return ssprintf("Row%dY",int(i+1)); }
void EditMenu::StripLockedStepsAndDifficulty( vector<StepsAndDifficulty> &v ) void EditMenu::StripLockedStepsAndDifficulty( vector<StepsAndDifficulty> &v )
{ {
const Song *pSong = GetSelectedSong(); const Song *pSong = GetSelectedSong();
for( int i=(int)v.size(); i>=0; i-- ) for( int i=(int)v.size()-1; i>=0; i-- )
{ {
if( v[i].pSteps && UNLOCKMAN->StepsIsLocked(pSong, v[i].pSteps) ) if( v[i].pSteps && UNLOCKMAN->StepsIsLocked(pSong, v[i].pSteps) )
v.erase( v.begin()+i ); v.erase( v.begin()+i );
@@ -480,31 +480,20 @@ void EditMenu::OnRowValueChanged( EditMenuRow row )
{ {
RString s; RString s;
Steps *pSteps = GetSelectedSteps(); Steps *pSteps = GetSelectedSteps();
if( pSteps && GetSelectedDifficulty() == DIFFICULTY_EDIT ) s = DifficultyToLocalizedString(GetSelectedDifficulty());
{
if( pSteps->GetDescription().empty() )
s += "-no name-";
else
s += pSteps->GetDescription();
s += " (" + DifficultyToLocalizedString(DIFFICULTY_EDIT) + ")";
}
else
{
s = DifficultyToLocalizedString(GetSelectedDifficulty());
// UGLY. "Edit" -> "New Edit" // UGLY. "Edit" -> "New Edit"
switch( EDIT_MODE.GetValue() ) switch( EDIT_MODE.GetValue() )
{ {
case EditMode_Home: case EditMode_Home:
s = "New " + s; s = "New " + s;
break; break;
case EditMode_Practice: case EditMode_Practice:
case EditMode_CourseMods: case EditMode_CourseMods:
case EditMode_Full: case EditMode_Full:
break; break;
default: default:
ASSERT(0); ASSERT(0);
}
} }
m_textValue[ROW_STEPS].SetText( s ); m_textValue[ROW_STEPS].SetText( s );
} }
@@ -550,8 +539,6 @@ void EditMenu::OnRowValueChanged( EditMenuRow row )
Steps *pSourceSteps = GetSelectedSourceSteps(); Steps *pSourceSteps = GetSelectedSourceSteps();
if( GetSelectedSourceDifficulty() == DIFFICULTY_INVALID ) if( GetSelectedSourceDifficulty() == DIFFICULTY_INVALID )
s = BLANK; s = BLANK;
else if( pSourceSteps && GetSelectedSourceDifficulty() == DIFFICULTY_EDIT )
s = pSourceSteps->GetDescription() + " (" + DifficultyToLocalizedString(DIFFICULTY_EDIT) + ")";
else else
s = DifficultyToLocalizedString(GetSelectedSourceDifficulty()); s = DifficultyToLocalizedString(GetSelectedSourceDifficulty());
m_textValue[ROW_SOURCE_STEPS].SetText( s ); m_textValue[ROW_SOURCE_STEPS].SetText( s );