This commit is contained in:
Glenn Maynard
2006-09-13 09:16:57 +00:00
parent 9da4770fe0
commit 4a8ba3a515
2 changed files with 5 additions and 5 deletions
+3 -3
View File
@@ -87,14 +87,14 @@ void Game::MenuInputToGameInput( MenuInput MenuI, GameInput GameIout[4] ) const
}
}
RString Game::ColToButtonName( int col ) const
RString Game::ColToButtonName( int iCol ) const
{
const Style *pStyle = GAMESTATE->GetCurrentStyle();
const char *pzColumnName = pStyle->m_ColumnInfo[PLAYER_1][col].pzName;
const char *pzColumnName = pStyle->m_ColumnInfo[PLAYER_1][iCol].pzName;
if( pzColumnName != NULL )
return pzColumnName;
GameInput GI = pStyle->StyleInputToGameInput( col, PLAYER_1 );
GameInput GI = pStyle->StyleInputToGameInput( iCol, PLAYER_1 );
return m_szButtonNames[GI.button];
}
+2 -2
View File
@@ -63,9 +63,9 @@ static void GetUsedGameInputs( vector<GameInput> &vGameInputsOut )
continue;
FOREACH_PlayerNumber( pn )
{
for( int i=0; i<(*style)->m_iColsPerPlayer; i++ )
for( int iCol=0; iCol<(*style)->m_iColsPerPlayer; ++iCol )
{
GameInput gi = (*style)->StyleInputToGameInput( i, pn );
GameInput gi = (*style)->StyleInputToGameInput( iCol, pn );
if( gi.IsValid() )
{
vGIs.insert( gi );