summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSimon Howard2007-06-13 19:12:13 +0000
committerSimon Howard2007-06-13 19:12:13 +0000
commite4127187e0e5de9c94a92301b4dc780bc9153fb8 (patch)
treeb0c3c6205739d10d6c1c98c31d70d07f63314e2a /src
parent22d473c19cddb35c8ba90fbe52beb7dff8377688 (diff)
downloadchocolate-doom-e4127187e0e5de9c94a92301b4dc780bc9153fb8.tar.gz
chocolate-doom-e4127187e0e5de9c94a92301b4dc780bc9153fb8.tar.bz2
chocolate-doom-e4127187e0e5de9c94a92301b4dc780bc9153fb8.zip
Working joystick code.
Subversion-branch: /trunk/chocolate-doom Subversion-revision: 903
Diffstat (limited to 'src')
-rw-r--r--src/i_joystick.c2
-rw-r--r--src/i_video.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/i_joystick.c b/src/i_joystick.c
index 0e0f7590..3eb9069d 100644
--- a/src/i_joystick.c
+++ b/src/i_joystick.c
@@ -108,6 +108,8 @@ void I_InitJoystick(void)
SDL_QuitSubSystem(SDL_INIT_JOYSTICK);
}
+ SDL_JoystickEventState(SDL_ENABLE);
+
// Initialised okay!
printf("I_InitJoystick: %s\n", SDL_JoystickName(joystick_index));
diff --git a/src/i_video.c b/src/i_video.c
index 39208ec3..0dfccfa3 100644
--- a/src/i_video.c
+++ b/src/i_video.c
@@ -555,6 +555,8 @@ void I_StartTic (void)
{
I_ReadMouse();
}
+
+ I_UpdateJoystick();
}