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

fix some warnings

Browse Source
This commit is contained in:
Glenn Maynard
2004-01-11 05:47:23 +00:00
parent 88be4f43a9
commit 898f394ae8
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenOptions.cpp
+1 -1
View File
@@ -134,7 +134,7 @@ void ScreenOptions::Init( InputMode im, OptionRowData OptionRows[], int iNumOpti
{ {
vector<bool> &vbSelected = Row.m_vbSelected[p]; vector<bool> &vbSelected = Row.m_vbSelected[p];
vbSelected.resize( Row.m_RowDef.choices.size() ); vbSelected.resize( Row.m_RowDef.choices.size() );
for( int j=0; j<vbSelected.size(); j++ ) for( unsigned j=0; j<vbSelected.size(); j++ )
vbSelected[j] = false; vbSelected[j] = false;
// set select the first item if not a multiselect row // set select the first item if not a multiselect row
stepmania/src/ScreenOptions.h
+2 -2
View File
@@ -128,7 +128,7 @@ protected:
vector<bool> m_vbSelected[NUM_PLAYERS]; // size = m_RowDef.choices.size(). vector<bool> m_vbSelected[NUM_PLAYERS]; // size = m_RowDef.choices.size().
int GetOneSelection( PlayerNumber pn ) int GetOneSelection( PlayerNumber pn )
{ {
for( int i=0; i<m_vbSelected[pn].size(); i++ ) for( unsigned i=0; i<(unsigned)m_vbSelected[pn].size(); i++ )
if( m_vbSelected[pn][i] ) if( m_vbSelected[pn][i] )
return i; return i;
ASSERT(0); // shouldn't call this if not expecting one to be selected ASSERT(0); // shouldn't call this if not expecting one to be selected
@@ -140,7 +140,7 @@ protected:
} }
void SetOneSelection( PlayerNumber pn, int iChoice ) void SetOneSelection( PlayerNumber pn, int iChoice )
{ {
for( int i=0; i<m_vbSelected[pn].size(); i++ ) for( unsigned i=0; i<(unsigned)m_vbSelected[pn].size(); i++ )
m_vbSelected[pn][i] = false; m_vbSelected[pn][i] = false;
m_vbSelected[pn][iChoice] = true; m_vbSelected[pn][iChoice] = true;
} }
stepmania/src/ScreenOptionsMaster.cpp
+5 -5
View File
@@ -69,7 +69,7 @@ void ScreenOptionsMaster::SetList( OptionRowData &row, OptionRowHandler &hand, C
row.bOneChoiceForAllPlayers = false; row.bOneChoiceForAllPlayers = false;
const int NumCols = atoi( asParts[0] ); const int NumCols = atoi( asParts[0] );
for( int i=0; i<asParts.size(); i++ ) for( unsigned i=0; i<asParts.size(); i++ )
{ {
if( asParts[i].CompareNoCase("together") == 0 ) if( asParts[i].CompareNoCase("together") == 0 )
row.bOneChoiceForAllPlayers = true; row.bOneChoiceForAllPlayers = true;
@@ -283,7 +283,7 @@ ScreenOptionsMaster::~ScreenOptionsMaster()
void SelectExactlyOne( int iSelection, vector<bool> &vbSelectedOut ) void SelectExactlyOne( int iSelection, vector<bool> &vbSelectedOut )
{ {
for( int i=0; i<vbSelectedOut.size(); i++ ) for( int i=0; i<(int)vbSelectedOut.size(); i++ )
vbSelectedOut[i] = i==iSelection; vbSelectedOut[i] = i==iSelection;
} }
@@ -435,7 +435,7 @@ void ScreenOptionsMaster::ImportOptions()
int GetOneSelection( const vector<bool> &vbSelected ) int GetOneSelection( const vector<bool> &vbSelected )
{ {
for( int i=0; i<vbSelected.size(); i++ ) for( unsigned i=0; i<vbSelected.size(); i++ )
if( vbSelected[i] ) if( vbSelected[i] )
return i; return i;
ASSERT(0); // shouldn't call this if not expecting one to be selected ASSERT(0); // shouldn't call this if not expecting one to be selected
@@ -451,7 +451,7 @@ int ScreenOptionsMaster::ExportOption( const OptionRowData &row, const OptionRow
case ROW_LIST: case ROW_LIST:
{ {
hand.Default.Apply( (PlayerNumber)pn ); hand.Default.Apply( (PlayerNumber)pn );
for( int i=0; i<vbSelected.size(); i++ ) for( unsigned i=0; i<vbSelected.size(); i++ )
if( vbSelected[i] ) if( vbSelected[i] )
hand.ListEntries[i].Apply( (PlayerNumber)pn ); hand.ListEntries[i].Apply( (PlayerNumber)pn );
} }
@@ -666,7 +666,7 @@ void ScreenOptionsMaster::RefreshIcons()
// find first selection and whether multiple are selected // find first selection and whether multiple are selected
int iFirstSelection = -1; int iFirstSelection = -1;
bool bMultipleSelected = false; bool bMultipleSelected = false;
for( int j=0; j<row.m_vbSelected[p].size(); j++ ) for( unsigned j=0; j<row.m_vbSelected[p].size(); j++ )
{ {
if( row.m_vbSelected[p][j] ) if( row.m_vbSelected[p][j] )
{ {