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

replace gotos with if blocks where appropriate

Browse Source
This commit is contained in:
Devin J. Pohly
2013-01-25 17:57:03 -05:00
parent 9237741149
commit 900d04e624
2 changed files with 33 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/OptionRowHandler.cpp
+13 -15
View File
@@ -457,30 +457,28 @@ 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 or metrics.
if (!(s == "" || s == "blank" || s == "Blank"))
{
goto nameGotten;
}
} }
if( pSteps->GetDifficulty() == Difficulty_Edit ) // TODO: find a way to make this use lua or metrics.
if (s == "" || s == "blank" || s == "Blank")
{ {
s = pSteps->GetChartName(); if( pSteps->GetDifficulty() == Difficulty_Edit )
if (s == "" || s == "blank" || s == "Blank")
s = pSteps->GetDescription();
}
else
{
if( pSteps->IsAnEdit() )
{ {
s = pSteps->GetChartName(); s = pSteps->GetChartName();
if (s == "" || s == "blank" || s == "Blank") if (s == "" || s == "blank" || s == "Blank")
s = pSteps->GetDescription(); s = pSteps->GetDescription();
} }
else else
s = CustomDifficultyToLocalizedString( GetCustomDifficulty( pSteps->m_StepsType, pSteps->GetDifficulty(), CourseType_Invalid ) ); {
if( pSteps->IsAnEdit() )
{
s = pSteps->GetChartName();
if (s == "" || s == "blank" || s == "Blank")
s = pSteps->GetDescription();
}
else
s = CustomDifficultyToLocalizedString( GetCustomDifficulty( pSteps->m_StepsType, pSteps->GetDifficulty(), CourseType_Invalid ) );
}
} }
nameGotten:
s += ssprintf( " %d", pSteps->GetMeter() ); s += ssprintf( " %d", pSteps->GetMeter() );
m_Def.m_vsChoices.push_back( s ); m_Def.m_vsChoices.push_back( s );
GameCommand mc; GameCommand mc;
src/Song.cpp
+20 -21
View File
@@ -869,31 +869,30 @@ void Song::ReCalculateRadarValuesAndLastSecond(bool fromCache, bool duringCache)
// calculate lastSecond // calculate lastSecond
// If it's autogen, then first/last beat will come from the parent. /* 1. If it's autogen, then first/last beat will come from the parent.
if( pSteps->IsAutogen() ) * 2. Don't calculate with edits unless the song only contains an edit
goto wipe_notedata;
/* Don't calculate with edits unless the song only contains an edit
* chart, like those in Mungyodance 3. Otherwise, edits installed on * chart, like those in Mungyodance 3. Otherwise, edits installed on
* the machine could extend the length of the song. */ * the machine could extend the length of the song. */
if( pSteps->IsAnEdit() && m_vpSteps.size() > 1 ) if( !pSteps->IsAutogen() &&
goto wipe_notedata; !( pSteps->IsAnEdit() && m_vpSteps.size() > 1 ) )
// Don't set first/last beat based on lights. They often start very
// early and end very late.
if( pSteps->m_StepsType == StepsType_lights_cabinet )
continue; // no need to wipe this.
/* Many songs have stray, empty song patterns. Ignore them, so they
* don't force the first beat of the whole song to 0. */
if( tempNoteData.GetLastRow() != 0 )
{ {
localFirst = min(localFirst, // Don't set first/last beat based on lights. They often start very
pSteps->GetTimingData()->GetElapsedTimeFromBeat(tempNoteData.GetFirstBeat())); // early and end very late.
localLast = max(localLast, if( pSteps->m_StepsType == StepsType_lights_cabinet )
pSteps->GetTimingData()->GetElapsedTimeFromBeat(tempNoteData.GetLastBeat())); continue; // no need to wipe this.
/* Many songs have stray, empty song patterns. Ignore them, so they
* don't force the first beat of the whole song to 0. */
if( tempNoteData.GetLastRow() != 0 )
{
localFirst = min(localFirst,
pSteps->GetTimingData()->GetElapsedTimeFromBeat(tempNoteData.GetFirstBeat()));
localLast = max(localLast,
pSteps->GetTimingData()->GetElapsedTimeFromBeat(tempNoteData.GetLastBeat()));
}
} }
wipe_notedata:
// Wipe NoteData
if (duringCache) if (duringCache)
{ {
NoteData dummy; NoteData dummy;