From e00ad1cd78716b61bb75741c2e9baffe77eceea2 Mon Sep 17 00:00:00 2001
From: Clownacy <Clownacy@users.noreply.github.com>
Date: Sat, 4 Apr 2020 19:04:56 +0100
Subject: [PATCH] Shuffle code

---
 src/Backends/Controller.h         |  2 +-
 src/Backends/GLFW3/Controller.cpp | 20 ++++++++++----------
 src/Backends/SDL2/Controller.cpp  | 24 ++++++++++++------------
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/Backends/Controller.h b/src/Backends/Controller.h
index 1e9f60e2..21339234 100644
--- 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);
diff --git a/src/Backends/GLFW3/Controller.cpp b/src/Backends/GLFW3/Controller.cpp
index 2810c7d2..71e83122 100644
--- a/src/Backends/GLFW3/Controller.cpp
+++ b/src/Backends/GLFW3/Controller.cpp
@@ -57,16 +57,6 @@ static void JoystickCallback(int joystick_id, int event)
 	}
 }
 
-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
@@ -80,6 +70,16 @@ BOOL ControllerBackend_Init(void)
 	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)
 {
 	if (!joystick_connected)
diff --git a/src/Backends/SDL2/Controller.cpp b/src/Backends/SDL2/Controller.cpp
index 2072ef20..2713753c 100644
--- a/src/Backends/SDL2/Controller.cpp
+++ b/src/Backends/SDL2/Controller.cpp
@@ -12,18 +12,6 @@ static SDL_Joystick *joystick = NULL;
 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);
 
@@ -37,6 +25,18 @@ BOOL ControllerBackend_Init(void)
 	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.
 // This function finds and hooks the first available DirectInput device (or SDL Joystick, in this case).
 BOOL FindAndOpenDirectInputDevice(void)