sm4svn sync part 2.

528089b: remove preferred group filtering (leaving the setting in for later use) [Glenn Maynard]
96821ad: fix pump routine right side DownLeft not drawn [Chris Danford]
fd88c62: easier debug stepping [Chris Danford]
This commit is contained in:
AJ Kelly
2010-02-13 13:37:03 -06:00
parent a7a8b6b94d
commit 777745b7fb
6 changed files with 14 additions and 27 deletions
+7 -2
View File
@@ -57,9 +57,14 @@ GameInput Style::StyleInputToGameInput( int iCol, PlayerNumber pn ) const
if( bUsingOneSide && gc != (int) pn )
continue;
for( GameButton gb=GAME_BUTTON_NEXT; gb < INPUTMAPPER->GetInputScheme()->m_iButtonsPerController && m_iInputColumn[gc][gb-GAME_BUTTON_NEXT] != END_MAPPING; gb=(GameButton)(gb+1) )
int iButtonsPerController = INPUTMAPPER->GetInputScheme()->m_iButtonsPerController;
for( GameButton gb=GAME_BUTTON_NEXT; gb < iButtonsPerController; gb=(GameButton)(gb+1) )
{
if( m_iInputColumn[gc][gb-GAME_BUTTON_NEXT] == iCol )
int iThisInputCol = m_iInputColumn[gc][gb-GAME_BUTTON_NEXT];
if( iThisInputCol == END_MAPPING )
break;
if( iThisInputCol == iCol )
return GameInput( gc, gb );
}
}