Restore proper edit behavior sans metric.

...we seriously need a new way of doing this.
This commit is contained in:
Jason Felds
2011-07-14 10:59:59 -04:00
parent 03f3140149
commit 3d8174dd03
+9 -3
View File
@@ -453,7 +453,7 @@ class OptionRowHandlerListSteps : public OptionRowHandlerList
if (STEPS_USE_CHART_NAME) if (STEPS_USE_CHART_NAME)
{ {
s = pSteps->GetChartName(); s = pSteps->GetChartName();
// TODO: find a way to make this use lua. // TODO: find a way to make this use lua or metrics.
if (!(s == "" || s == "blank" || s == "Blank")) if (!(s == "" || s == "blank" || s == "Blank"))
{ {
goto nameGotten; goto nameGotten;
@@ -461,12 +461,18 @@ class OptionRowHandlerListSteps : public OptionRowHandlerList
} }
if( pSteps->GetDifficulty() == Difficulty_Edit ) if( pSteps->GetDifficulty() == Difficulty_Edit )
{ {
s = pSteps->GetDescription(); s = pSteps->GetChartName();
if (s == "" || s == "blank" || s == "Blank")
s = pSteps->GetDescription();
} }
else else
{ {
if( pSteps->IsAnEdit() ) if( pSteps->IsAnEdit() )
s = pSteps->GetDescription(); {
s = pSteps->GetChartName();
if (s == "" || s == "blank" || s == "Blank")
s = pSteps->GetDescription();
}
else else
s = CustomDifficultyToLocalizedString( GetCustomDifficulty( pSteps->m_StepsType, pSteps->GetDifficulty(), CourseType_Invalid ) ); s = CustomDifficultyToLocalizedString( GetCustomDifficulty( pSteps->m_StepsType, pSteps->GetDifficulty(), CourseType_Invalid ) );
} }