From 2a9f693965227c1798716a110fb6087a13a9fde7 Mon Sep 17 00:00:00 2001 From: Nemirtingas Date: Sun, 19 Jan 2020 12:14:03 +0100 Subject: [PATCH] Remove initialization var, its done in steam_controller --- controller/gamepad.c | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/controller/gamepad.c b/controller/gamepad.c index 53a830d..8f3bdac 100644 --- a/controller/gamepad.c +++ b/controller/gamepad.c @@ -81,8 +81,6 @@ struct GAMEPAD_STATE { /* State of the gamepads */ static GAMEPAD_STATE STATE[GAMEPAD_COUNT]; -static int initialized = 0; - /* Note whether a gamepad is currently connected */ #define FLAG_CONNECTED (1<<0) #define FLAG_RUMBLE (1<<1) @@ -523,27 +521,20 @@ static void GamepadRemoveDevice(const WCHAR* devPath) { void GamepadInit(void) { int i; - if (initialized == 0) - { - initialized = 1; - /* initialize connection state */ - for (i = 0; i != GAMEPAD_COUNT; ++i) { - STATE[i].flags = 0; - STATE[i].hDevice = INVALID_HANDLE_VALUE; - STATE[i].device = NULL; - } - - GamepadDetect(); + /* initialize connection state */ + for (i = 0; i != GAMEPAD_COUNT; ++i) { + STATE[i].flags = 0; + STATE[i].hDevice = INVALID_HANDLE_VALUE; + STATE[i].device = NULL; } + + GamepadDetect(); } void GamepadUpdate(void) { static unsigned long last = 0; unsigned long cur = time(NULL); - if (initialized == 0) - GamepadInit(); - if (last + 2 < cur) { GamepadDetect(); last = cur;