TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fix phantom hat when used with a joystick without one, since the code ignored the JOYCAPS_HASPOV flag (d1x r1.5)

Browse source
This commit is contained in:
Bradley Bell 2004-05-22 08:00:04 +00:00
parent c423c903b8
commit 29cd30b9a8
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,5 +1,9 @@
2004-05-22 Matthew Mueller <donut@dakotacom.net>
* arch/win32/joyhh.c: fix phantom hat when used with a joystick
without one, since the code ignored the JOYCAPS_HASPOV flag (d1x
r1.5)
* arch/ogl/gr.c: fix possibility of saving incomplete .tga
screenshots if the entire thing wasn't written in one call to
write() (d1x r1.35)

7
arch/win32/joyhh.c
View file

@ -1,4 +1,4 @@
/* $Id: joyhh.c,v 1.4 2004-05-20 23:10:17 btb Exp $ */
/* $Id: joyhh.c,v 1.5 2004-05-22 08:00:04 btb Exp $ */
//JOYC.C for D1_3Dfx and D1OpenGL
//D1_3Dfx is a Win32 executable using Glide and DirectX 3
//D1OpenGL is a Win32 executable using OpenGL and DirectX 3
@ -67,6 +67,7 @@ typedef struct Button_info {
typedef struct Joy_info {
int joyid;
ubyte present_mask;
ubyte hat_present;
ubyte slow_read;
int max_timer;
int read_count;
@ -160,7 +161,7 @@ ubyte joy_read_raw_buttons()
/* Hat stuff */
if (joy.dwPOV != JOY_POVCENTERED)
if (joystick.hat_present && joy.dwPOV != JOY_POVCENTERED)
{
joystick.buttons[19].state = (joy.dwPOV < JOY_POVRIGHT || joy.dwPOV > JOY_POVLEFT);
joystick.buttons[15].state = (joy.dwPOV < JOY_POVBACKWARD && joy.dwPOV > JOY_POVFORWARD);
@ -307,7 +308,7 @@ int joy_init(int joyid) //HH: added joyid parameter
joystick.present_mask = JOY_1_X_AXIS | JOY_1_Y_AXIS;
if (pjc.wCaps & JOYCAPS_HASZ) joystick.present_mask |= JOY_1_Z_AXIS;
// if (pjc.wCaps & JOYCAPS_HASPOV) joystick.present_mask |= JOY_1_POV;
joystick.hat_present = (pjc.wCaps & JOYCAPS_HASPOV) > 0;
if (pjc.wCaps & JOYCAPS_HASR) joystick.present_mask |= JOY_1_R_AXIS;
if (pjc.wCaps & JOYCAPS_HASU) joystick.present_mask |= JOY_1_U_AXIS;
if (pjc.wCaps & JOYCAPS_HASV) joystick.present_mask |= JOY_1_V_AXIS;