From 095b6f5ba0d1bc7ee2fc6e1892cb59af2dbdfb89 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 13 Jan 2007 01:16:00 +0000 Subject: [PATCH] GameToMenu -> GameButtonToMenuButton --- stepmania/src/InputMapper.cpp | 4 ++-- stepmania/src/InputMapper.h | 2 +- stepmania/src/StepMania.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/stepmania/src/InputMapper.cpp b/stepmania/src/InputMapper.cpp index 43f771e12a..5bb5ce4a79 100644 --- a/stepmania/src/InputMapper.cpp +++ b/stepmania/src/InputMapper.cpp @@ -825,9 +825,9 @@ PlayerNumber InputMapper::ControllerToPlayerNumber( GameController controller ) return (PlayerNumber) controller; } -MenuButton InputMapper::GameToMenu( const GameInput &GameI ) +MenuButton InputMapper::GameButtonToMenuButton( GameButton gb ) { - return m_pInputScheme->GameButtonToMenuButton( GameI.button ); + return m_pInputScheme->GameButtonToMenuButton( gb ); } /* If set (not PLAYER_INVALID), inputs from both GameControllers will be mapped diff --git a/stepmania/src/InputMapper.h b/stepmania/src/InputMapper.h index 5df913edb1..76ebe6b35a 100644 --- a/stepmania/src/InputMapper.h +++ b/stepmania/src/InputMapper.h @@ -84,7 +84,7 @@ public: bool DeviceToGame( const DeviceInput &DeviceI, GameInput& GameI ); // return true if there is a mapping from device to pad bool GameToDevice( const GameInput &GameI, int iSlotNum, DeviceInput& DeviceI ); // return true if there is a mapping from pad to device - MenuButton GameToMenu( const GameInput &GameI ); + MenuButton GameButtonToMenuButton( GameButton gb ); void MenuToGame( MenuButton MenuI, PlayerNumber pn, GameInput GameIout[4] ); PlayerNumber ControllerToPlayerNumber( GameController controller ); diff --git a/stepmania/src/StepMania.cpp b/stepmania/src/StepMania.cpp index a2c588eb1f..fc81328ad1 100644 --- a/stepmania/src/StepMania.cpp +++ b/stepmania/src/StepMania.cpp @@ -1387,7 +1387,7 @@ void HandleInputEvents(float fDeltaTime) if( input.GameI.IsValid() ) { - input.MenuI = INPUTMAPPER->GameToMenu( input.GameI ); + input.MenuI = INPUTMAPPER->GameButtonToMenuButton( input.GameI.button ); input.pn = INPUTMAPPER->ControllerToPlayerNumber( input.GameI.controller ); }