From 91ee16754f1c449a4351817cacecfd850434df66 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Tue, 21 Nov 2006 07:16:19 +0000 Subject: [PATCH] move GetMenuButtonSecondaryFunction into InputScheme --- stepmania/src/GameManager.cpp | 11 ----------- stepmania/src/GameManager.h | 1 - stepmania/src/InputMapper.cpp | 9 +++++++++ stepmania/src/InputMapper.h | 1 + stepmania/src/ScreenMapControllers.cpp | 4 +--- stepmania/src/ScreenTestInput.cpp | 4 +--- 6 files changed, 12 insertions(+), 18 deletions(-) diff --git a/stepmania/src/GameManager.cpp b/stepmania/src/GameManager.cpp index d97ce1e73b..19cbd58124 100644 --- a/stepmania/src/GameManager.cpp +++ b/stepmania/src/GameManager.cpp @@ -2490,17 +2490,6 @@ const Style* GameManager::GameAndStringToStyle( const Game *game, RString sStyle return NULL; } - -MenuButton GameManager::GetMenuButtonSecondaryFunction( const Game *pGame, GameButton gb ) const -{ - FOREACH_MenuButton(m) - if( pGame->m_InputScheme.m_SecondaryMenuButton[m] == gb ) - return m; - - return MenuButton_Invalid; // only used in gameplay -} - - // lua start #include "LuaBinding.h" diff --git a/stepmania/src/GameManager.h b/stepmania/src/GameManager.h index 7383a5bb78..24b924aa65 100644 --- a/stepmania/src/GameManager.h +++ b/stepmania/src/GameManager.h @@ -37,7 +37,6 @@ public: static const Game* StringToGameType( RString sGameType ); const Style* GameAndStringToStyle( const Game* pGame, RString sStyle ); static RString StyleToLocalizedString( const Style* s ); - MenuButton GetMenuButtonSecondaryFunction( const Game *pGame, GameButton gb ) const; // Lua void PushSelf( lua_State *L ); diff --git a/stepmania/src/InputMapper.cpp b/stepmania/src/InputMapper.cpp index c34ff70218..80d9bf0bbe 100644 --- a/stepmania/src/InputMapper.cpp +++ b/stepmania/src/InputMapper.cpp @@ -977,6 +977,15 @@ void InputScheme::MenuButtonToGameInputs( MenuButton MenuI, PlayerNumber pn, Gam } } +MenuButton InputScheme::GetMenuButtonSecondaryFunction( GameButton gb ) const +{ + FOREACH_MenuButton(mb) + if( m_SecondaryMenuButton[mb] == gb ) + return mb; + + return MenuButton_Invalid; +} + /* * (c) 2001-2003 Chris Danford * All rights reserved. diff --git a/stepmania/src/InputMapper.h b/stepmania/src/InputMapper.h index cfc43945b3..7a5af9787f 100644 --- a/stepmania/src/InputMapper.h +++ b/stepmania/src/InputMapper.h @@ -31,6 +31,7 @@ public: GameButton ButtonNameToIndex( const RString &sButtonName ) const; MenuButton GameInputToMenuButton( GameInput GameI ) const; void MenuButtonToGameInputs( MenuButton MenuI, PlayerNumber pn, GameInput GameIout[4] ) const; + MenuButton GetMenuButtonSecondaryFunction( GameButton gb ) const; }; #define FOREACH_GameButtonInScheme( s, var ) for( GameButton var=(GameButton)0; varm_iButtonsPerController; enum_add( var, +1 ) ) diff --git a/stepmania/src/ScreenMapControllers.cpp b/stepmania/src/ScreenMapControllers.cpp index 2752697a48..bce54d2b45 100644 --- a/stepmania/src/ScreenMapControllers.cpp +++ b/stepmania/src/ScreenMapControllers.cpp @@ -4,8 +4,6 @@ #include "RageLog.h" #include "RageInput.h" #include "InputMapper.h" -#include "GameManager.h" -#include "GameState.h" #include "ThemeManager.h" #include "ScreenDimensions.h" #include "InputEventPlus.h" @@ -104,7 +102,7 @@ void ScreenMapControllers::Init() BitmapText *pSecondary = new BitmapText; pSecondary->SetName( "Secondary" ); pSecondary->LoadFromFont( THEME->GetPathF("Common","title") ); - MenuButton mb = GAMEMAN->GetMenuButtonSecondaryFunction( GAMESTATE->GetCurrentGame(), pKey->m_GameButton ); + MenuButton mb = INPUTMAPPER->GetInputScheme()->GetMenuButtonSecondaryFunction( pKey->m_GameButton ); RString sText; if( mb != MenuButton_Invalid ) sText = MenuButtonToLocalizedString( mb ); diff --git a/stepmania/src/ScreenTestInput.cpp b/stepmania/src/ScreenTestInput.cpp index 0d013fbd7a..e7a067511c 100644 --- a/stepmania/src/ScreenTestInput.cpp +++ b/stepmania/src/ScreenTestInput.cpp @@ -3,10 +3,8 @@ #include "ScreenManager.h" #include "RageLog.h" #include "InputMapper.h" -#include "GameState.h" #include "ThemeManager.h" #include "ScreenDimensions.h" -#include "GameManager.h" #include "PrefsManager.h" #include "RageInput.h" #include "InputEventPlus.h" @@ -61,7 +59,7 @@ class InputList: public BitmapText if( !PREFSMAN->m_bOnlyDedicatedMenuButtons ) { - MenuButton mb = GAMEMAN->GetMenuButtonSecondaryFunction( GAMESTATE->GetCurrentGame(), gi.button ); + MenuButton mb = INPUTMAPPER->GetInputScheme()->GetMenuButtonSecondaryFunction( gi.button ); if( mb != MenuButton_Invalid ) sTemp += ssprintf( " - (%s %s)", MenuButtonToLocalizedString(mb).c_str(), SECONDARY.GetValue().c_str() ); }