summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/fixer.h12
-rw-r--r--src/main.c8
2 files changed, 10 insertions, 10 deletions
diff --git a/src/fixer.h b/src/fixer.h
index 2766cf7..e044215 100644
--- a/src/fixer.h
+++ b/src/fixer.h
@@ -209,12 +209,12 @@ typedef DPMSG_DESTROYPLAYERORGROUP * LPDPMSG_DESTROYPLAYERORGROUP;
typedef struct JOYINFOEX
{
- int dwXpos;
- int dwYpos;
- int dwRpos;
- int dwUpos;
- int dwVpos;
- int dwPOV;
+ DWORD dwXpos;
+ DWORD dwYpos;
+ DWORD dwRpos;
+ DWORD dwUpos;
+ DWORD dwVpos;
+ DWORD dwPOV;
} JOYINFOEX;
typedef struct JOYCAPS
diff --git a/src/main.c b/src/main.c
index b04426e..43a0278 100644
--- a/src/main.c
+++ b/src/main.c
@@ -113,7 +113,7 @@ void ReadJoysticks()
JoystickData.dwRpos = 0;
JoystickData.dwUpos = 0;
JoystickData.dwVpos = 0;
- JoystickData.dwPOV = -1;
+ JoystickData.dwPOV = (DWORD) -1;
if (joy == NULL || !GotJoystick) {
return;
@@ -138,7 +138,7 @@ void ReadJoysticks()
switch (hat) {
default:
case SDL_HAT_CENTERED:
- JoystickData.dwPOV = -1;
+ JoystickData.dwPOV = (DWORD) -1;
break;
case SDL_HAT_UP:
JoystickData.dwPOV = 0;
@@ -415,7 +415,7 @@ int InitSDL()
LoadDeviceAndVideoModePreferences();
if (WantJoystick) {
- SDL_Init(SDL_INIT_JOYSTICK);
+ SDL_InitSubSystem(SDL_INIT_JOYSTICK);
if (SDL_NumJoysticks() > 0) {
/* TODO: make joystick number a configuration parameter */
@@ -432,7 +432,7 @@ int InitSDL()
JoystickData.dwRpos = 0;
JoystickData.dwUpos = 0;
JoystickData.dwVpos = 0;
- JoystickData.dwPOV = -1;
+ JoystickData.dwPOV = (DWORD) -1;
}
}