MenuInputToGameInput -> MenuButtonToGameInputs
This commit is contained in:
@@ -38,7 +38,7 @@ MenuButton Game::GameInputToMenuButton( GameInput GameI ) const
|
|||||||
return MenuButton_INVALID; // invalid GameInput
|
return MenuButton_INVALID; // invalid GameInput
|
||||||
}
|
}
|
||||||
|
|
||||||
void Game::MenuInputToGameInput( MenuButton MenuI, PlayerNumber pn, GameInput GameIout[4] ) const
|
void Game::MenuButtonToGameInputs( MenuButton MenuI, PlayerNumber pn, GameInput GameIout[4] ) const
|
||||||
{
|
{
|
||||||
ASSERT( MenuI != MenuButton_INVALID );
|
ASSERT( MenuI != MenuButton_INVALID );
|
||||||
|
|
||||||
|
|||||||
@@ -52,7 +52,7 @@ public:
|
|||||||
|
|
||||||
GameButton ButtonNameToIndex( const RString &sButtonName ) const;
|
GameButton ButtonNameToIndex( const RString &sButtonName ) const;
|
||||||
MenuButton GameInputToMenuButton( GameInput GameI ) const;
|
MenuButton GameInputToMenuButton( GameInput GameI ) const;
|
||||||
void MenuInputToGameInput( MenuButton MenuI, PlayerNumber pn, GameInput GameIout[4] ) const; // looks up current style in GAMESTATE. Yuck.
|
void MenuButtonToGameInputs( MenuButton MenuI, PlayerNumber pn, GameInput GameIout[4] ) const; // looks up current style in GAMESTATE. Yuck.
|
||||||
RString ColToButtonName( int col ) const; // looks up current style. Yuck.
|
RString ColToButtonName( int col ) const; // looks up current style. Yuck.
|
||||||
|
|
||||||
TapNoteScore MapTapNoteScore( TapNoteScore tns ) const;
|
TapNoteScore MapTapNoteScore( TapNoteScore tns ) const;
|
||||||
|
|||||||
@@ -778,7 +778,7 @@ MenuButton InputMapper::GameToMenu( const GameInput &GameI )
|
|||||||
void InputMapper::MenuToGame( MenuButton MenuI, PlayerNumber pn, GameInput GameIout[4] )
|
void InputMapper::MenuToGame( MenuButton MenuI, PlayerNumber pn, GameInput GameIout[4] )
|
||||||
{
|
{
|
||||||
const Game* pGame = GAMESTATE->GetCurrentGame();
|
const Game* pGame = GAMESTATE->GetCurrentGame();
|
||||||
pGame->MenuInputToGameInput( MenuI, pn, GameIout );
|
pGame->MenuButtonToGameInputs( MenuI, pn, GameIout );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user