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

various commits from SM4 SVN, courtesy of Glenn and Vyhd.

Browse Source
This commit is contained in:
AJ Kelly
2010-02-14 23:02:34 -06:00
parent 3c09722d3c
commit 75861f22a1
36 changed files with 760 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ScreenEdit.cpp
+7 -4
View File
@@ -712,7 +712,7 @@ void ScreenEdit::Init()
CopyToLastSave();
m_CurrentAction = MAIN_MENU_CHOICE_INVALID;
if( GAMESTATE->m_pCurSteps[0]->m_StepsType == StepsType_dance_routine )
if( GAMESTATE->GetCurrentStyle()->m_StyleType == StyleType_TwoPlayersSharedSides )
m_InputPlayerNumber = PLAYER_1;
else
m_InputPlayerNumber = PLAYER_INVALID;
@@ -2179,6 +2179,12 @@ void ScreenEdit::InputPlay( const InputEventPlus &input, EditButton EditB )
bool bRelease = input.type == IET_RELEASE;
switch( input.pn )
{
case PLAYER_2:
// ignore player 2 input unless this mode requires it
if( GAMESTATE->GetCurrentStyle()->m_StyleType != StyleType_TwoPlayersSharedSides )
break;
// fall through to input handling logic:
case PLAYER_1:
{
switch( gbt )
@@ -2199,9 +2205,6 @@ void ScreenEdit::InputPlay( const InputEventPlus &input, EditButton EditB )
}
}
break;
case PLAYER_2:
if( GAMESTATE->GetCurrentStyle()->m_StyleType == StyleType_TwoPlayersSharedSides )
m_Player->Step( iCol, -1, input.DeviceI.ts, false, input.type == IET_RELEASE );
}
}