Previously, each GameButton had a SecondaryFunction; MenuButtons
mapped to each corresponding GameButton, and to each GameButton
with a matching SecondaryFunction.
Simplify. Now, MenuButtons map to each GameButton with a matching
SecondaryFunction. Merged GetMenuButtonSecondaryFunction and
GameButtonToMenuButton.
("MenuButtons" and "SecondaryFunction" are confusing legacy
terminology now. Changing it once I figure out what to change
it to ...)
This commit is contained in:
@@ -59,8 +59,8 @@ class InputList: public BitmapText
|
||||
|
||||
if( !PREFSMAN->m_bOnlyDedicatedMenuButtons )
|
||||
{
|
||||
GameButton mb = INPUTMAPPER->GetInputScheme()->GetMenuButtonSecondaryFunction( gi.button );
|
||||
if( mb != GameButton_Invalid )
|
||||
GameButton mb = INPUTMAPPER->GetInputScheme()->GameButtonToMenuButton( gi.button );
|
||||
if( mb != GameButton_Invalid && mb != gi.button )
|
||||
{
|
||||
RString sGameButtonString = GameButtonToLocalizedString( INPUTMAPPER->GetInputScheme(), mb );
|
||||
sTemp += ssprintf( " - (%s %s)", sGameButtonString.c_str(), SECONDARY.GetValue().c_str() );
|
||||
|
||||
Reference in New Issue
Block a user