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

Bugfixes: set number of buttons in the configuration (since it is

Browse Source 
not saved in the config file), use floating point in desensitizing.
This commit is contained in:
hiker 2014-11-01 09:53:13 +11:00
parent b992375c58
commit 62ef836e7c
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/input/gamepad_device.cpp
View File

@ -36,18 +36,13 @@ GamePadDevice::GamePadDevice(const int irr_index, const std::string &name,
m_prev_axis_directions = NULL; m_prev_axis_directions = NULL;
m_configuration = configuration; m_configuration = configuration;
GamepadConfig *config = static_cast<GamepadConfig*>(m_configuration); GamepadConfig *config = static_cast<GamepadConfig*>(m_configuration);
if(m_configuration->getNumberOfButtons()!=button_count) if(m_configuration->getNumberOfButtons()<button_count)
{ {
Log::warn("GamePadDevice", static_cast<GamepadConfig*>(m_configuration)->setNumberOfButtons(button_count);
"Different number of buttons for '%s': was %d now %d.",
getName().c_str(), config->getNumberOfButtons(),
button_count);
} }
if(m_configuration->getNumberOfAxes()!=axis_count) if(m_configuration->getNumberOfAxes()<axis_count)
{ {
Log::warn("GamePadDevice", static_cast<GamepadConfig*>(m_configuration)->setNumberOfAxis(axis_count);
"Different number of axis for '%s': was %d now %d.",
getName().c_str(), config->getNumberOfAxes(), axis_count);
} }
m_prev_axis_directions = new Input::AxisDirection[axis_count]; m_prev_axis_directions = new Input::AxisDirection[axis_count];
m_prev_axis_value = new int[axis_count]; m_prev_axis_value = new int[axis_count];
@ -181,7 +176,7 @@ bool GamePadDevice::processAndMapInput(Input::InputType type, const int id,
// x/32767 is in [-1,1], (x/32767)^2 is in [0,1]. Take care of the // x/32767 is in [-1,1], (x/32767)^2 is in [0,1]. Take care of the
// sign and map this back to [0,32767] by multiplying by 32767. // sign and map this back to [0,32767] by multiplying by 32767.
// Which all in all results in: // Which all in all results in:
*value = int( (*value / 32767) * fabsf(*value) ); *value = int( (*value / 32767.0f) * fabsf(*value) );
} }
bool success = false; bool success = false;