duuqnd/cave-story-solaris
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cleanup and proper deinitialisation

Browse source
This commit is contained in:
Clownacy 2020-04-04 19:03:19 +01:00
parent e874b75357
commit 659f89ea85
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/Backends/GLFW3/Controller.cpp
View file

@ -1,5 +1,6 @@
#include "../Controller.h" #include "../Controller.h"
#include <stddef.h>
#include <stdio.h> #include <stdio.h>
#define GLFW_INCLUDE_NONE #define GLFW_INCLUDE_NONE
@ -58,7 +59,12 @@ static void JoystickCallback(int joystick_id, int event)
void ControllerBackend_Deinit(void) void ControllerBackend_Deinit(void)
{ {
glfwSetJoystickCallback(NULL);
joystick_connected = FALSE;
connected_joystick_id = 0;
joystick_neutral_x = 0;
joystick_neutral_y = 0;
} }
BOOL ControllerBackend_Init(void) BOOL ControllerBackend_Init(void)
@ -92,6 +98,7 @@ BOOL ControllerBackend_GetJoystickStatus(JOYSTICK_STATUS *status)
int total_buttons; int total_buttons;
const unsigned char *buttons = glfwGetJoystickButtons(connected_joystick_id, &total_buttons); const unsigned char *buttons = glfwGetJoystickButtons(connected_joystick_id, &total_buttons);
// The original `Input.cpp` assumed there were 32 buttons (because of DirectInput's `DIJOYSTATE` struct)
if (total_buttons > 32) if (total_buttons > 32)
total_buttons = 32; total_buttons = 32;

2
src/Backends/SDL2/Controller.cpp
View file

@ -67,7 +67,7 @@ BOOL ControllerBackend_GetJoystickStatus(JOYSTICK_STATUS *status)
if (joystick == NULL) if (joystick == NULL)
return FALSE; return FALSE;
// The original Input.cpp assumed there were 32 buttons (because of DirectInput's 'DIJOYSTATE' struct) // The original `Input.cpp` assumed there were 32 buttons (because of DirectInput's `DIJOYSTATE` struct)
int numButtons = SDL_JoystickNumButtons(joystick); int numButtons = SDL_JoystickNumButtons(joystick);
if (numButtons > 32) if (numButtons > 32)
numButtons = 32; numButtons = 32;