gameplay fixup

This commit is contained in:
Glenn Maynard
2007-01-12 06:28:57 +00:00
parent 28df360da4
commit 90b1b20c89
+6 -3
View File
@@ -58,14 +58,17 @@ GameInput Style::StyleInputToGameInput( int iCol, PlayerNumber pn ) const
int Style::GameInputToColumn( const GameInput &GameI ) const
{
if( m_iInputColumn[GameI.controller][GameI.button] == NO_MAPPING )
if( GameI.button < GAME_BUTTON_NEXT )
return Column_Invalid;
int iColumnIndex = GameI.button - GAME_BUTTON_NEXT;
if( m_iInputColumn[GameI.controller][iColumnIndex] == NO_MAPPING )
return Column_Invalid;
for( int i = 0; i <= GameI.button; ++i )
for( int i = 0; i <= iColumnIndex; ++i )
if( m_iInputColumn[GameI.controller][i] == END_MAPPING )
return Column_Invalid;
return m_iInputColumn[GameI.controller][GameI.button];
return m_iInputColumn[GameI.controller][iColumnIndex];
}