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

fix multiselect + options icon crash

Browse Source
This commit is contained in:
Chris Danford
2004-01-11 02:28:10 +00:00
parent 028e5bd6c8
commit dc863c8f31
3 changed files with 35 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/OptionIcon.cpp
+2 -1
View File
@@ -58,7 +58,8 @@ void OptionIcon::Load( PlayerNumber pn, CString sText, bool bHeader )
sText.Replace( " ", "\n" );
bool bVacant = (sText=="");
m_spr.SetState( pn*3 + (bHeader?0:(bVacant?1:2)) );
int iState = pn*3 + (bHeader?0:(bVacant?1:2));
m_spr.SetState( iState );
m_text.SetText( bHeader ? "" : sText );
m_text.SetZoom( TEXT_ZOOM );
stepmania/src/ScreenOptions.cpp
+2
View File
@@ -1113,6 +1113,8 @@ void ScreenOptions::MenuStart( PlayerNumber pn, const InputEventType type )
m_SoundToggleOn.Play();
else
m_SoundToggleOff.Play();
PositionUnderlines();
RefreshIcons();
}
else
{
stepmania/src/ScreenOptionsMaster.cpp
+31 -21
View File
@@ -598,35 +598,45 @@ void ScreenOptionsMaster::RefreshIcons()
Row &row = *m_Rows[i];
const OptionRowData &data = row.m_RowDef;
int iSelection = row.GetOneSelection((PlayerNumber)p);
if( iSelection >= (int)data.choices.size() )
// find first selection and whether multiple are selected
int iFirstSelection = -1;
bool bMultipleSelected = false;
for( int j=0; j<row.m_vbSelected[p].size(); j++ )
{
/* Invalid selection. Send debug output, to aid debugging. */
CString error = ssprintf("Option row with name '%s' selects item %i, but there are only %i items:\n",
data.name.c_str(),
iSelection, (int) data.choices.size() );
if( row.m_vbSelected[p][j] )
{
if( iFirstSelection != -1 )
bMultipleSelected = true;
else
iFirstSelection = j;
}
for( unsigned j = 0; j < data.choices.size(); ++j )
error += ssprintf(" %s\n", data.choices[j].c_str());
RageException::Throw( "%s", error.c_str() );
}
// set icon name
CString sIcon;
const OptionRowHandler &handler = OptionRowHandlers[i];
switch( handler.type )
if( bMultipleSelected )
{
case ROW_LIST:
sIcon = handler.ListEntries[iSelection].m_sModifiers;
break;
case ROW_STEP:
case ROW_CHARACTER:
sIcon = data.choices[iSelection];
break;
case ROW_CONFIG:
break;
sIcon = "Multiple";
}
else if( iFirstSelection != -1 )
{
const OptionRowHandler &handler = OptionRowHandlers[i];
switch( handler.type )
{
case ROW_LIST:
sIcon = handler.ListEntries[iFirstSelection].m_sModifiers;
break;
case ROW_STEP:
case ROW_CHARACTER:
sIcon = data.choices[iFirstSelection];
break;
case ROW_CONFIG:
break;
}
}
/* XXX: hack to not display text in the song options menu */
if( data.bOneChoiceForAllPlayers )