ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed duplicated A/B handling for xbox/classic xbox; use "thumb button"

Browse Source 
instead of "stick button", and more switch instead of if.
This commit is contained in:
hiker
2014-11-03 13:51:54 +11:00
parent e488b61b62
commit ce488aa98f
1 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/input/gamepad_config.cpp
View File

@@ -163,8 +163,6 @@ core::stringw GamepadConfig::getBindingAsString(const PlayerAction action) const
{
switch(id)
{
case 0: return "A";
case 1: return "B";
// I18N: Name of the black button on xbox controller
case 2: return _("Black");
case 3: return "X";
@@ -204,36 +202,29 @@ core::stringw GamepadConfig::getBindingAsString(const PlayerAction action) const
case 5: return _("Right bumper");
case 6: return _("Back");
case 7: return _("Start");
case 8: return _("Left stick button");
case 9: return _("Right stick button");
case 8: return _("Left thumb button");
case 9: return _("Right thumb button");
default: return DeviceConfig::getBindingAsString(action);
} // switch
} // if IT_STICKBUTTON
if(it==Input::IT_STICKMOTION)
{
if(id==2)
return ad==Input::AD_POSITIVE ? _("Left trigger")
: _("Right trigger");
if (id == Input::HAT_H_ID)
{
return (ad == Input::AD_POSITIVE) ? _("DPad up")
: _("DPad down");
}
else if (id == Input::HAT_V_ID)
{
return (ad == Input::AD_POSITIVE) ? _("DPad right")
: _("DPad left");
}
switch(id)
{
case 0: return (ad==Input::AD_POSITIVE) ? _("Left thumb right")
: _("Left thumb left");
case 1: return (ad==Input::AD_POSITIVE) ? _("Left thumb down")
: _("Left thumb up");
case 2: return (ad==Input::AD_POSITIVE) ? _("Left trigger")
: _("Right trigger");
case 3: return (ad==Input::AD_POSITIVE) ? _("Right thumb down")
: _("Right thumb up");
case 4: return (ad==Input::AD_POSITIVE) ? _("Right thumb right")
: _("Right thumb left");
case Input::HAT_H_ID: return (ad == Input::AD_POSITIVE) ? _("DPad up")
: _("DPad down");
case Input::HAT_V_ID: return (ad == Input::AD_POSITIVE) ? _("DPad right")
: _("DPad left");
} // switch
}
} // xbox