From a2ecd752717febcda3bcb91e3a06a2ab7ce94202 Mon Sep 17 00:00:00 2001 From: Clownacy Date: Tue, 11 Aug 2020 00:06:25 +0100 Subject: [PATCH] Restore an original struct name This was buried in the Linux port --- src/Input.cpp | 2 +- src/Input.h | 4 ++-- src/Main.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Input.cpp b/src/Input.cpp index 86905b6a..95e3a2a9 100644 --- a/src/Input.cpp +++ b/src/Input.cpp @@ -161,7 +161,7 @@ BOOL CALLBACK EnumDevices_Callback(LPCDIDEVICEINSTANCE lpddi, LPVOID pvRef) return DIENUM_STOP; } -BOOL GetJoystickStatus(JOYSTICK_STATUS *status) +BOOL GetJoystickStatus(DIRECTINPUTSTATUS *status) { DIJOYSTATE joystate; diff --git a/src/Input.h b/src/Input.h index feaf9178..6f733486 100644 --- a/src/Input.h +++ b/src/Input.h @@ -2,7 +2,7 @@ #include "WindowsWrapper.h" -struct JOYSTICK_STATUS +struct DIRECTINPUTSTATUS { BOOL bLeft; BOOL bRight; @@ -13,5 +13,5 @@ struct JOYSTICK_STATUS void ReleaseDirectInput(void); BOOL InitDirectInput(HINSTANCE hinst, HWND hWnd); -BOOL GetJoystickStatus(JOYSTICK_STATUS *status); +BOOL GetJoystickStatus(DIRECTINPUTSTATUS *status); BOOL ResetJoystickStatus(void); diff --git a/src/Main.cpp b/src/Main.cpp index c1a19d1b..2acff283 100644 --- a/src/Main.cpp +++ b/src/Main.cpp @@ -775,7 +775,7 @@ BOOL SystemTask(void) void JoystickProc(void) { int i; - JOYSTICK_STATUS status; + DIRECTINPUTSTATUS status; if (!GetJoystickStatus(&status)) return;