vector<bool> x; bool &b = x[0]; is illegal: vector<bool> is optimized
to a bitset (packed), and you can't have a pointer to a packed bit (stupid optimization; if I want a bitset, I'll use a bitset!)
This commit is contained in:
@@ -1108,7 +1108,7 @@ void ScreenOptions::MenuStart( PlayerNumber pn, const InputEventType type )
|
|||||||
if( data.bMultiSelect )
|
if( data.bMultiSelect )
|
||||||
{
|
{
|
||||||
int iChoiceInRow = row.m_iChoiceWithFocus[pn];
|
int iChoiceInRow = row.m_iChoiceWithFocus[pn];
|
||||||
row.m_vbSelected[pn][iChoiceInRow] ^= true;
|
row.m_vbSelected[pn][iChoiceInRow] = !row.m_vbSelected[pn][iChoiceInRow];
|
||||||
if( row.m_vbSelected[pn][iChoiceInRow] )
|
if( row.m_vbSelected[pn][iChoiceInRow] )
|
||||||
m_SoundToggleOn.Play();
|
m_SoundToggleOn.Play();
|
||||||
else
|
else
|
||||||
|
|||||||
@@ -298,8 +298,7 @@ void ScreenOptionsMaster::ImportOption( const OptionRowData &row, const OptionRo
|
|||||||
{
|
{
|
||||||
const ModeChoice &mc = hand.ListEntries[e];
|
const ModeChoice &mc = hand.ListEntries[e];
|
||||||
|
|
||||||
bool &bSelected = vbSelectedOut[e];
|
vbSelectedOut[e] = false;
|
||||||
bSelected = false;
|
|
||||||
|
|
||||||
if( mc.IsZero() )
|
if( mc.IsZero() )
|
||||||
{
|
{
|
||||||
@@ -318,7 +317,7 @@ void ScreenOptionsMaster::ImportOption( const OptionRowData &row, const OptionRo
|
|||||||
if( !row.bMultiSelect )
|
if( !row.bMultiSelect )
|
||||||
SelectExactlyOne( e, vbSelectedOut );
|
SelectExactlyOne( e, vbSelectedOut );
|
||||||
else
|
else
|
||||||
bSelected = true;
|
vbSelectedOut[e] = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@@ -328,7 +327,7 @@ void ScreenOptionsMaster::ImportOption( const OptionRowData &row, const OptionRo
|
|||||||
if( !row.bMultiSelect )
|
if( !row.bMultiSelect )
|
||||||
SelectExactlyOne( e, vbSelectedOut );
|
SelectExactlyOne( e, vbSelectedOut );
|
||||||
else
|
else
|
||||||
bSelected = true;
|
vbSelectedOut[e] = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user