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

simplify

Browse Source
This commit is contained in:
Glenn Maynard
2004-12-06 05:19:10 +00:00
parent ad8b7c19b7
commit 26d07ff58c
1 changed files with 3 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Game.cpp
+2 -16
View File
@@ -27,23 +27,9 @@ GameButton Game::ButtonNameToIndex( const CString &sButtonName ) const
MenuInput Game::GameInputToMenuInput( GameInput GameI ) const MenuInput Game::GameInputToMenuInput( GameInput GameI ) const
{ {
PlayerNumber pn; PlayerNumber pn = (PlayerNumber) GameI.controller;
StyleType type = TWO_PLAYERS_TWO_SIDES;
if( GAMESTATE->GetCurrentStyle() ) if( GAMESTATE->GetCurrentStyle() )
type = GAMESTATE->GetCurrentStyle()->m_StyleType; pn = GAMESTATE->GetCurrentStyle()->ControllerToPlayerNumber(GameI.controller);
switch( type )
{
case ONE_PLAYER_ONE_SIDE:
case TWO_PLAYERS_TWO_SIDES:
pn = (PlayerNumber)GameI.controller;
break;
case ONE_PLAYER_TWO_SIDES:
pn = GAMESTATE->m_MasterPlayerNumber;
break;
default:
ASSERT(0); return MenuInput(); // invalid m_StyleType
};
FOREACH_MenuButton(i) FOREACH_MenuButton(i)
if( m_DedicatedMenuButton[i] == GameI.button ) if( m_DedicatedMenuButton[i] == GameI.button )