From 0d138e13d81f2d8a25d564427b6174cfaafafaa7 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Thu, 14 Sep 2006 20:57:07 +0000 Subject: [PATCH] MenuInputToGameInput -> MenuButtonToGameInputs --- stepmania/src/Game.cpp | 2 +- stepmania/src/Game.h | 2 +- stepmania/src/InputMapper.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/stepmania/src/Game.cpp b/stepmania/src/Game.cpp index ec2ec45b81..3a6216f451 100644 --- a/stepmania/src/Game.cpp +++ b/stepmania/src/Game.cpp @@ -38,7 +38,7 @@ MenuButton Game::GameInputToMenuButton( GameInput GameI ) const 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 ); diff --git a/stepmania/src/Game.h b/stepmania/src/Game.h index 50c306e492..24a93c7a50 100644 --- a/stepmania/src/Game.h +++ b/stepmania/src/Game.h @@ -52,7 +52,7 @@ public: GameButton ButtonNameToIndex( const RString &sButtonName ) 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. TapNoteScore MapTapNoteScore( TapNoteScore tns ) const; diff --git a/stepmania/src/InputMapper.cpp b/stepmania/src/InputMapper.cpp index 3b578b2c40..402637488f 100644 --- a/stepmania/src/InputMapper.cpp +++ b/stepmania/src/InputMapper.cpp @@ -778,7 +778,7 @@ MenuButton InputMapper::GameToMenu( const GameInput &GameI ) void InputMapper::MenuToGame( MenuButton MenuI, PlayerNumber pn, GameInput GameIout[4] ) { const Game* pGame = GAMESTATE->GetCurrentGame(); - pGame->MenuInputToGameInput( MenuI, pn, GameIout ); + pGame->MenuButtonToGameInputs( MenuI, pn, GameIout ); }