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

cleanup

Browse Source 
fix hold notes on 2p side
This commit is contained in:
Glenn Maynard
2004-12-06 05:34:40 +00:00
parent 7e2adc093a
commit aa2062e380
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Style.cpp
+4 -6
View File
@@ -43,6 +43,9 @@ GameInput Style::StyleInputToGameInput( const StyleInput& StyleI ) const
FOREACH_GameController(gc) FOREACH_GameController(gc)
{ {
if( this->m_StyleType != ONE_PLAYER_TWO_SIDES && gc != (int) StyleI.player )
continue;
for( int i = 0; i < m_pGame->m_iButtonsPerController && m_iInputColumn[gc][i] != END_MAPPING; ++i ) for( int i = 0; i < m_pGame->m_iButtonsPerController && m_iInputColumn[gc][i] != END_MAPPING; ++i )
if( m_iInputColumn[gc][i] == StyleI.col ) if( m_iInputColumn[gc][i] == StyleI.col )
return GameInput( gc, i ); return GameInput( gc, i );
@@ -62,12 +65,7 @@ StyleInput Style::GameInputToStyleInput( const GameInput &GameI ) const
if( m_iInputColumn[GameI.controller][i] == END_MAPPING ) if( m_iInputColumn[GameI.controller][i] == END_MAPPING )
return SI; // Return invalid. return SI; // Return invalid.
SI = StyleInput( (PlayerNumber) GameI.controller, m_iInputColumn[GameI.controller][GameI.button] ); SI = StyleInput( ControllerToPlayerNumber(GameI.controller), m_iInputColumn[GameI.controller][GameI.button] );
// HACK: Looking up the player number using m_ColumnInfo
// returns the wrong answer for ONE_PLAYER_TWO_SIDES styles
if( m_StyleType == ONE_PLAYER_TWO_SIDES )
SI.player = GAMESTATE->m_MasterPlayerNumber;
return SI; return SI;
} }