diff --git a/src/g_game.c b/src/g_game.c index 7d3aec1a8..1e0c7e462 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -1180,26 +1180,6 @@ boolean InputDown(INT32 gc, UINT8 p) } } -// Returns true if the hat is pressed for the specified player -// 0 is up, 1 is down, 2 is left, 3 is right -// Basically a hack needed to allow the d-pad on the vote screen. -boolean HatDown(UINT8 dir, UINT8 p) -{ - if (p == 1 && gamekeydown[KEY_HAT1 + dir]) - return true; - - if (p == 2 && gamekeydown[KEY_2HAT1 + dir]) - return true; - - if (p == 3 && gamekeydown[KEY_3HAT1 + dir]) - return true; - - if (p == 4 && gamekeydown[KEY_4HAT1 + dir]) - return true; - - return false; -} - INT32 JoyAxis(axis_input_e axissel, UINT8 p) { switch (p) diff --git a/src/g_game.h b/src/g_game.h index aff15ce4d..14dc12d01 100644 --- a/src/g_game.h +++ b/src/g_game.h @@ -100,7 +100,6 @@ INT16 G_ClipAimingPitch(INT32 *aiming); INT16 G_SoftwareClipAimingPitch(INT32 *aiming); boolean InputDown(INT32 gc, UINT8 p); -boolean HatDown(UINT8 dir, UINT8 p); INT32 JoyAxis(axis_input_e axissel, UINT8 p); extern angle_t localangle, localangle2, localangle3, localangle4; diff --git a/src/y_inter.c b/src/y_inter.c index 6073f93ec..379d5cd39 100644 --- a/src/y_inter.c +++ b/src/y_inter.c @@ -1318,13 +1318,13 @@ void Y_VoteTicker(void) && !voteclient.playerinfo[i].delay && pickedvote == -1 && votes[p] == -1) { - if (InputDown(gc_aimforward, i+1) || JoyAxis(AXISAIM, i+1) < 0 || HatDown(0, i+1)) + if (InputDown(gc_aimforward, i+1) || JoyAxis(AXISAIM, i+1) < 0) { voteclient.playerinfo[i].selection--; pressed = true; } - if ((InputDown(gc_aimbackward, i+1) || JoyAxis(AXISAIM, i+1) > 0 || HatDown(1, i+1)) && !pressed) + if ((InputDown(gc_aimbackward, i+1) || JoyAxis(AXISAIM, i+1) > 0) && !pressed) { voteclient.playerinfo[i].selection++; pressed = true;