mirror of
https://github.com/Lime3DS/Lime3DS
synced 2024-12-27 01:22:37 -06:00
fix ASAN error in sdl_impl.cpp (#7427)
This commit is contained in:
parent
0c40c10022
commit
3c9157b1ec
1 changed files with 13 additions and 11 deletions
|
@ -429,18 +429,20 @@ Common::ParamPackage SDLState::GetSDLControllerButtonBindByGUID(
|
||||||
|
|
||||||
#if SDL_VERSION_ATLEAST(2, 0, 6)
|
#if SDL_VERSION_ATLEAST(2, 0, 6)
|
||||||
{
|
{
|
||||||
const SDL_ExtendedGameControllerBind extended_bind =
|
if (mapped_button != SDL_CONTROLLER_BUTTON_INVALID) {
|
||||||
controller->bindings[mapped_button];
|
const SDL_ExtendedGameControllerBind extended_bind =
|
||||||
if (extended_bind.input.axis.axis_max < extended_bind.input.axis.axis_min) {
|
controller->bindings[mapped_button];
|
||||||
params.Set("direction", "-");
|
if (extended_bind.input.axis.axis_max < extended_bind.input.axis.axis_min) {
|
||||||
} else {
|
params.Set("direction", "-");
|
||||||
params.Set("direction", "+");
|
} else {
|
||||||
|
params.Set("direction", "+");
|
||||||
|
}
|
||||||
|
params.Set("threshold", (extended_bind.input.axis.axis_min +
|
||||||
|
(extended_bind.input.axis.axis_max -
|
||||||
|
extended_bind.input.axis.axis_min) /
|
||||||
|
2.0f) /
|
||||||
|
SDL_JOYSTICK_AXIS_MAX);
|
||||||
}
|
}
|
||||||
params.Set(
|
|
||||||
"threshold",
|
|
||||||
(extended_bind.input.axis.axis_min +
|
|
||||||
(extended_bind.input.axis.axis_max - extended_bind.input.axis.axis_min) / 2.0f) /
|
|
||||||
SDL_JOYSTICK_AXIS_MAX);
|
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
params.Set("direction", "+"); // lacks extended_bind, so just a guess
|
params.Set("direction", "+"); // lacks extended_bind, so just a guess
|
||||||
|
|
Loading…
Reference in a new issue