summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/Src/ControllerInterface/Android/Android.h
diff options
context:
space:
mode:
authorRyan Houdek <Sonicadvance1@gmail.com>2013-12-12 21:24:39 -0600
committerRyan Houdek <Sonicadvance1@gmail.com>2013-12-12 21:24:39 -0600
commit2e1aa64958ec767180e8a592cb51e5caa8db92b8 (patch)
tree804ed896cbd25ba9b4e3200be4855887b6cbee88 /Source/Core/InputCommon/Src/ControllerInterface/Android/Android.h
parentd7be993889245c913f8da5183182b340c04a087b (diff)
[Android] Fix joysticks only capable of right/down movements. Also make it capable of using onscreen joystick even if controller 1 is bound.
Diffstat (limited to 'Source/Core/InputCommon/Src/ControllerInterface/Android/Android.h')
-rw-r--r--Source/Core/InputCommon/Src/ControllerInterface/Android/Android.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/Android/Android.h b/Source/Core/InputCommon/Src/ControllerInterface/Android/Android.h
index 8b1fd99c23..93e528f013 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/Android/Android.h
+++ b/Source/Core/InputCommon/Src/ControllerInterface/Android/Android.h
@@ -43,11 +43,12 @@ private:
{
public:
std::string GetName() const;
- Axis(int padID, ButtonManager::ButtonType index) : _padID(padID), _index(index) {}
+ Axis(int padID, ButtonManager::ButtonType index, float neg = 1.0f) : _padID(padID), _index(index), _neg(neg) {}
ControlState GetState() const;
private:
const int _padID;
const ButtonManager::ButtonType _index;
+ const float _neg;
};
public: