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

Fix 2850 by increasing the number of axis for a gamepad to include

Browse Source 
D-pad.
This commit is contained in:
hiker 2017-07-30 23:05:27 +10:00
parent 65c8cb7ae1
commit e6a134c347
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/input/gamepad_device.cpp
View File

@ -39,13 +39,21 @@ GamePadDevice::GamePadDevice(const int irr_index, const std::string &name,
{ {
config->setNumberOfButtons(button_count); config->setNumberOfButtons(button_count);
} }
if(m_configuration->getNumberOfAxes()<axis_count)
// HAT/POV buttons will be reported as additional axis with the values
// HAT_V_ID > HAT_H_ID. So increase the number of axis to be large
// enough to handle HAT_V/H_ID as axis number.
assert(Input::HAT_V_ID > Input::HAT_H_ID);
int adj_axis_count = axis_count > Input::HAT_V_ID ? axis_count
: Input::HAT_V_ID+1;
if(m_configuration->getNumberOfAxes()<adj_axis_count)
{ {
config->setNumberOfAxis(axis_count); config->setNumberOfAxis(adj_axis_count);
} }
m_prev_axis_directions.resize(axis_count); m_prev_axis_directions.resize(adj_axis_count);
m_prev_axis_value.resize(axis_count); m_prev_axis_value.resize(adj_axis_count);
m_axis_ok.resize(axis_count); m_axis_ok.resize(adj_axis_count);
m_irr_index = irr_index; m_irr_index = irr_index;
m_name = name; m_name = name;