Merge branch 'accurate' into portable
This commit is contained in:
commit
c26954a559
1 changed files with 5 additions and 7 deletions
|
@ -8,10 +8,10 @@
|
||||||
|
|
||||||
#include "WindowsWrapper.h"
|
#include "WindowsWrapper.h"
|
||||||
|
|
||||||
static SDL_Joystick *joystick;
|
// The original names for these variables are unknown
|
||||||
|
static SDL_Joystick *joystick = NULL;
|
||||||
static int joystick_neutral_x;
|
static int joystick_neutral_x = 0;
|
||||||
static int joystick_neutral_y;
|
static int joystick_neutral_y = 0;
|
||||||
|
|
||||||
void ReleaseDirectInput(void)
|
void ReleaseDirectInput(void)
|
||||||
{
|
{
|
||||||
|
@ -25,8 +25,6 @@ void ReleaseDirectInput(void)
|
||||||
SDL_QuitSubSystem(SDL_INIT_JOYSTICK);
|
SDL_QuitSubSystem(SDL_INIT_JOYSTICK);
|
||||||
}
|
}
|
||||||
|
|
||||||
BOOL HookAllDirectInputDevices(void);
|
|
||||||
|
|
||||||
BOOL InitDirectInput(void)
|
BOOL InitDirectInput(void)
|
||||||
{
|
{
|
||||||
SDL_InitSubSystem(SDL_INIT_JOYSTICK);
|
SDL_InitSubSystem(SDL_INIT_JOYSTICK);
|
||||||
|
@ -37,7 +35,7 @@ BOOL InitDirectInput(void)
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
// The original name for this function is unknown
|
// The original name for this function and its variables are unknown
|
||||||
BOOL HookAllDirectInputDevices(void)
|
BOOL HookAllDirectInputDevices(void)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
|
Loading…
Add table
Reference in a new issue