shithub: cstory

Info  •  Files  •  Log  •  Branches

Restore an original struct name

This was buried in the Linux port

--- a/src/Input.cpp

+++ b/src/Input.cpp

@@ -161,7 +161,7 @@

 	return DIENUM_STOP;

 }

-BOOL GetJoystickStatus(JOYSTICK_STATUS *status)

+BOOL GetJoystickStatus(DIRECTINPUTSTATUS *status)

 {

 	DIJOYSTATE joystate;

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

 void ReleaseDirectInput(void);

 BOOL InitDirectInput(HINSTANCE hinst, HWND hWnd);

-BOOL GetJoystickStatus(JOYSTICK_STATUS *status);

+BOOL GetJoystickStatus(DIRECTINPUTSTATUS *status);

 BOOL ResetJoystickStatus(void);

--- a/src/Main.cpp

+++ b/src/Main.cpp

@@ -775,7 +775,7 @@

 void JoystickProc(void)

 {

 	int i;

-	JOYSTICK_STATUS status;

+	DIRECTINPUTSTATUS status;

 	if (!GetJoystickStatus(&status))

 		return;