shithub: cstory

Info  •  Files  •  Log  •  Branches

Shuffle code

--- a/src/Backends/Controller.h

+++ b/src/Backends/Controller.h

@@ -4,7 +4,7 @@

 #include "../Input.h"

-void ControllerBackend_Deinit(void);

 BOOL ControllerBackend_Init(void);

+void ControllerBackend_Deinit(void);

 BOOL ControllerBackend_GetJoystickStatus(JOYSTICK_STATUS *status);

 BOOL ControllerBackend_ResetJoystickStatus(void);

--- a/src/Backends/GLFW3/Controller.cpp

+++ b/src/Backends/GLFW3/Controller.cpp

@@ -57,16 +57,6 @@

 	}

 }

-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)

 {

 	// Connect joysticks that are already plugged-in

@@ -78,6 +68,16 @@

 	glfwSetJoystickCallback(JoystickCallback);

 	return TRUE;

+}

+

+void ControllerBackend_Deinit(void)

+{

+	glfwSetJoystickCallback(NULL);

+

+	joystick_connected = FALSE;

+	connected_joystick_id = 0;

+	joystick_neutral_x = 0;

+	joystick_neutral_y = 0;

 }

 BOOL ControllerBackend_GetJoystickStatus(JOYSTICK_STATUS *status)

--- a/src/Backends/SDL2/Controller.cpp

+++ b/src/Backends/SDL2/Controller.cpp

@@ -12,18 +12,6 @@

 static int joystick_neutral_x = 0;

 static int joystick_neutral_y = 0;

-void ControllerBackend_Deinit(void)

-{

-	// Close opened joystick (if exists)

-	if (joystick != NULL)

-	{

-		SDL_JoystickClose(joystick);

-		joystick = NULL;

-	}

-

-	SDL_QuitSubSystem(SDL_INIT_JOYSTICK);

-}

-

 // It looks like Pixel declared his functions early, so he could forward-reference

 BOOL FindAndOpenDirectInputDevice(void);

@@ -35,6 +23,18 @@

 		return FALSE;

 	return TRUE;

+}

+

+void ControllerBackend_Deinit(void)

+{

+	// Close opened joystick (if exists)

+	if (joystick != NULL)

+	{

+		SDL_JoystickClose(joystick);

+		joystick = NULL;

+	}

+

+	SDL_QuitSubSystem(SDL_INIT_JOYSTICK);

 }

 // The original name for this function and its variables are unknown.