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

Changed many parts of GameCommand to improve error reporting. Fixed GameCommand setpref to not set when loading the command. Minor fix to ScreenOptionsExample.ini to explain that SongInCurrentSongGroup is unusable. CommonMetrics, CourseContentsList, HoldJudgent, OptionRowHandler all have minor changes to fix crashes on malformed theme data.

Browse Source
This commit is contained in:
Kyzentun
2014-07-14 15:41:04 -06:00
committed by Jonathan Payne
parent 5df80b6e0e
commit 4343a99ea9
10 changed files with 147 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/OptionRowHandler.cpp
+12 -7
View File
@@ -434,7 +434,7 @@ class OptionRowHandlerListSteps : public OptionRowHandlerList
m_Def.m_vsChoices.push_back( "" );
m_aListEntries.push_back( GameCommand() );
}
else if( GAMESTATE->IsCourseMode() && GAMESTATE->m_pCurCourse ) // playing a course
else if(GAMESTATE->GetCurrentStyle() && GAMESTATE->IsCourseMode() && GAMESTATE->m_pCurCourse) // playing a course
{
m_Def.m_bOneChoiceForAllPlayers = (bool)PREFSMAN->m_bLockCourseDifficulties;
m_Def.m_layoutType = StringToLayoutType( STEPS_ROW_LAYOUT_TYPE );
@@ -453,7 +453,7 @@ class OptionRowHandlerListSteps : public OptionRowHandlerList
m_aListEntries.push_back( mc );
}
}
else if( GAMESTATE->m_pCurSong ) // playing a song
else if(GAMESTATE->GetCurrentStyle() && GAMESTATE->m_pCurSong) // playing a song
{
m_Def.m_layoutType = StringToLayoutType( STEPS_ROW_LAYOUT_TYPE );
@@ -634,26 +634,31 @@ public:
{
unsigned i = iter - m_vSteps.begin();
vbSelOut[i] = true;
return;
continue;
}
// look for matching difficulty
bool matched= false;
if( m_pDifficultyToFill )
{
FOREACH_CONST( Difficulty, m_vDifficulties, d )
{
unsigned i = d - m_vDifficulties.begin();
if( *d == GAMESTATE->m_PreferredDifficulty[0] )
if( *d == GAMESTATE->m_PreferredDifficulty[p] )
{
vbSelOut[i] = true;
matched= true;
vector<PlayerNumber> v;
v.push_back( p );
ExportOption( v, vbSelectedOut ); // current steps changed
continue;
break;
}
}
}
// default to 1st
vbSelOut[0] = true;
if(!matched)
{
// default to 1st
vbSelOut[0] = true;
}
}
}
virtual int ExportOption( const vector<PlayerNumber> &vpns, const vector<bool> vbSelected[NUM_PLAYERS] ) const