ref: 6bb240d335bd4357d8466e8adae45624800c0d99
parent: e0674d8f54ef1fe2a2bfd39a45ca845bf3d908dd
author: Clownacy <Clownacy@users.noreply.github.com>
date: Sat Apr 4 20:11:52 EDT 2020
Fixes
--- a/src/Backends/GLFW3/Controller.cpp
+++ b/src/Backends/GLFW3/Controller.cpp
@@ -25,10 +25,10 @@
if (!joystick_connected)
{- int total_axis;
- const float *axis = glfwGetJoystickAxes(joystick_id, &total_axis);
+ int total_axes;
+ const float *axes = glfwGetJoystickAxes(joystick_id, &total_axes);
- if (total_axis >= 2)
+ if (total_axes >= 2)
{#if GLFW_VERSION_MAJOR > 3 || (GLFW_VERSION_MAJOR == 3 && GLFW_VERSION_MINOR >= 3)
if (glfwJoystickIsGamepad(joystick_id) == GLFW_TRUE) // Avoid selecting things like laptop touchpads
@@ -39,9 +39,6 @@
connected_joystick_id = joystick_id;
// Set up neutral axes
- int total_axes;
- const float *axes = glfwGetJoystickAxes(connected_joystick_id, &total_axes);
-
axis_neutrals = (float*)malloc(sizeof(float) * total_axes);
for (int i = 0; i < total_axes; ++i)
@@ -104,13 +101,13 @@
const unsigned char *hats = glfwGetJoystickHats(connected_joystick_id, &total_hats);
// Handle direction inputs
- if (axes >= 1)
+ if (total_axes >= 1)
{status->bLeft = axes[0] < -DEADZONE;
status->bRight = axes[0] > DEADZONE;
}
- if (axes >= 2)
+ if (total_axes >= 2)
{status->bUp = axes[1] < -DEADZONE;
status->bDown = axes[1] > DEADZONE;
--
⑨