diff options
author | 2016-03-21 08:27:06 +0100 | |
---|---|---|
committer | 2016-03-21 08:27:06 +0100 | |
commit | a99df788017c2bf5a56034d4f9152bf8ab95a168 (patch) | |
tree | 3beec27b413c75b8f9f88199519e45fd07959bf8 /src/osd/modules/input/input_xinput.cpp | |
parent | b224d9a77ad6483daf2b60b75dbdc323a3bcd4b0 (diff) | |
parent | 3afd990226a2c647290579bebb5537bd0fd3faac (diff) |
Merge with master
Diffstat (limited to 'src/osd/modules/input/input_xinput.cpp')
-rw-r--r-- | src/osd/modules/input/input_xinput.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/osd/modules/input/input_xinput.cpp b/src/osd/modules/input/input_xinput.cpp index b88dbe24c1a..596f79fabe4 100644 --- a/src/osd/modules/input/input_xinput.cpp +++ b/src/osd/modules/input/input_xinput.cpp @@ -297,13 +297,13 @@ protected: continue; // Add the axes - for (int i = 0; i < XINPUT_MAX_AXIS; i++) + for (int axisnum = 0; axisnum < XINPUT_MAX_AXIS; axisnum++) { devinfo->device()->add_item( - xinput_axis_name[i], - xinput_axis_ids[i], + xinput_axis_name[axisnum], + xinput_axis_ids[axisnum], generic_axis_get_state, - &devinfo->gamepad.sThumbLX + i); + &devinfo->gamepad.sThumbLX + axisnum); } // Populate the POVs |