diff --git a/src/g_game.c b/src/g_game.c index 200ce7834..8a786929b 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -751,47 +751,49 @@ INT32 JoyAxis(axis_input_e axissel, UINT8 player) INT32 axisval; boolean flp = false; + UINT8 pnum = player-1; + //find what axis to get switch (axissel) { case AXISTURN: - axisval = cv_turnaxis[player-1].value; + axisval = cv_turnaxis[pnum].value; break; case AXISMOVE: - axisval = cv_moveaxis[player-1].value; + axisval = cv_moveaxis[pnum].value; break; case AXISCAMTURN: - axisval = cv_camturnaxis[player-1].value; + axisval = cv_camturnaxis[pnum].value; break; case AXISCAMSTRAFE: - axisval = cv_camstrafeaxis[player-1].value; + axisval = cv_camstrafeaxis[pnum].value; break; case AXISBRAKE: - axisval = cv_brakeaxis[player-1].value; + axisval = cv_brakeaxis[pnum].value; break; case AXISAIM: - axisval = cv_aimaxis[player-1].value; + axisval = cv_aimaxis[pnum].value; break; case AXISLOOK: - axisval = cv_lookaxis[player-1].value; + axisval = cv_lookaxis[pnum].value; break; case AXISFIRE: - axisval = cv_fireaxis[player-1].value; + axisval = cv_fireaxis[pnum].value; break; case AXISDRIFT: - axisval = cv_driftaxis[player-1].value; + axisval = cv_driftaxis[pnum].value; break; case AXISLOOKBACK: - axisval = cv_lookbackaxis[player-1].value; + axisval = cv_lookbackaxis[pnum].value; break; case AXISCUSTOM1: - axisval = cv_custom1axis[player-1].value; + axisval = cv_custom1axis[pnum].value; break; case AXISCUSTOM2: - axisval = cv_custom2axis[player-1].value; + axisval = cv_custom2axis[pnum].value; break; case AXISCUSTOM3: - axisval = cv_custom3axis[player-1].value; + axisval = cv_custom3axis[pnum].value; break; default: return 0; @@ -802,44 +804,51 @@ INT32 JoyAxis(axis_input_e axissel, UINT8 player) axisval = -axisval; flp = true; } + if (axisval > JOYAXISSET*2 || axisval == 0) //not there in array or None return 0; - if (axisval%2) + if (axisval % 2) { axisval /= 2; - retaxis = joyxmove[axisval]; + retaxis = joyxmove[pnum][axisval]; if (retaxis < (-JOYAXISRANGE)) retaxis = -JOYAXISRANGE; if (retaxis > (+JOYAXISRANGE)) retaxis = +JOYAXISRANGE; - if (!Joystick[player-1].bGamepadStyle && axissel < AXISDEAD) + if (!Joystick[pnum].bGamepadStyle && axissel < AXISDEAD) { - const INT32 jdeadzone = ((JOYAXISRANGE-1) * cv_xdeadzone[player-1].value) >> FRACBITS; + const INT32 jdeadzone = ((JOYAXISRANGE-1) * cv_xdeadzone[pnum].value) >> FRACBITS; if (abs(retaxis) <= jdeadzone) return 0; } - if (flp) retaxis = -retaxis; //flip it around + + if (flp) + retaxis = -retaxis; // flip it around + return retaxis; } else { axisval--; axisval /= 2; - retaxis = joyymove[axisval]; + retaxis = joyymove[pnum][axisval]; if (retaxis < (-JOYAXISRANGE)) retaxis = -JOYAXISRANGE; if (retaxis > (+JOYAXISRANGE)) retaxis = +JOYAXISRANGE; - if (!Joystick[player-1].bGamepadStyle && axissel < AXISDEAD) + if (!Joystick[pnum].bGamepadStyle && axissel < AXISDEAD) { - const INT32 jdeadzone = ((JOYAXISRANGE-1) * cv_ydeadzone[player-1].value) >> FRACBITS; + const INT32 jdeadzone = ((JOYAXISRANGE-1) * cv_ydeadzone[pnum].value) >> FRACBITS; if (abs(retaxis) <= jdeadzone) return 0; } - if (flp) retaxis = -retaxis; //flip it around + + if (flp) + retaxis = -retaxis; // flip it around + return retaxis; } } @@ -1286,15 +1295,9 @@ static void G_DoLoadLevel(boolean resetplayer) } // clear cmd building stuff - memset(gamekeydown, 0, sizeof (gamekeydown)); - - for (i = 0; i < JOYAXISSET; i++) - { - joyxmove[i] = joyymove[i] = 0; - joy2xmove[i] = joy2ymove[i] = 0; - joy3xmove[i] = joy3ymove[i] = 0; - joy4xmove[i] = joy4ymove[i] = 0; - } + memset(gamekeydown, 0, sizeof(gamekeydown)); + memset(joyxmove, 0, sizeof(joyxmove)); + memset(joyymove, 0, sizeof(joyymove)); mousex = mousey = 0; // clear hud messages remains (usually from game startup) diff --git a/src/g_input.c b/src/g_input.c index 43b7f48ca..e096b7243 100644 --- a/src/g_input.c +++ b/src/g_input.c @@ -114,8 +114,7 @@ INT32 mousex, mousey; INT32 mlooky; // like mousey but with a custom sensitivity for mlook // joystick values are repeated -INT32 joyxmove[JOYAXISSET], joyymove[JOYAXISSET], joy2xmove[JOYAXISSET], joy2ymove[JOYAXISSET], -joy3xmove[JOYAXISSET], joy3ymove[JOYAXISSET], joy4xmove[JOYAXISSET], joy4ymove[JOYAXISSET]; +INT32 joyxmove[MAXSPLITSCREENPLAYERS][JOYAXISSET], joyymove[MAXSPLITSCREENPLAYERS][JOYAXISSET]; // current state of the keys: true if pushed UINT8 gamekeydown[NUMINPUTS]; @@ -187,32 +186,32 @@ void G_MapEventsToControls(event_t *ev) i = ev->data1; if (i >= JOYAXISSET || menuactive || CON_Ready() || chat_on) break; - if (ev->data2 != INT32_MAX) joyxmove[i] = ev->data2; - if (ev->data3 != INT32_MAX) joyymove[i] = ev->data3; + if (ev->data2 != INT32_MAX) joyxmove[0][i] = ev->data2; + if (ev->data3 != INT32_MAX) joyymove[0][i] = ev->data3; break; case ev_joystick2: // buttons are virtual keys i = ev->data1; if (i >= JOYAXISSET || menuactive) break; - if (ev->data2 != INT32_MAX) joy2xmove[i] = ev->data2; - if (ev->data3 != INT32_MAX) joy2ymove[i] = ev->data3; + if (ev->data2 != INT32_MAX) joyxmove[1][i] = ev->data2; + if (ev->data3 != INT32_MAX) joyymove[1][i] = ev->data3; break; case ev_joystick3: i = ev->data1; if (i >= JOYAXISSET) break; - if (ev->data2 != INT32_MAX) joy3xmove[i] = ev->data2; - if (ev->data3 != INT32_MAX) joy3ymove[i] = ev->data3; + if (ev->data2 != INT32_MAX) joyxmove[2][i] = ev->data2; + if (ev->data3 != INT32_MAX) joyymove[2][i] = ev->data3; break; case ev_joystick4: i = ev->data1; if (i >= JOYAXISSET) break; - if (ev->data2 != INT32_MAX) joy4xmove[i] = ev->data2; - if (ev->data3 != INT32_MAX) joy4ymove[i] = ev->data3; + if (ev->data2 != INT32_MAX) joyxmove[3][i] = ev->data2; + if (ev->data3 != INT32_MAX) joyymove[3][i] = ev->data3; break; default: @@ -258,15 +257,6 @@ void G_ResetControls(void) memset(joyxmove, 0, sizeof(joyxmove)); memset(joyymove, 0, sizeof(joyymove)); - memset(joy2xmove, 0, sizeof(joy2xmove)); - memset(joy2ymove, 0, sizeof(joy2ymove)); - - memset(joy3xmove, 0, sizeof(joy3xmove)); - memset(joy3ymove, 0, sizeof(joy3ymove)); - - memset(joy4xmove, 0, sizeof(joy4xmove)); - memset(joy4ymove, 0, sizeof(joy4ymove)); - // reset those just in case the game missed the keyup event memset(dpadscrollstate, false, sizeof(dpadscrollstate)); } diff --git a/src/g_input.h b/src/g_input.h index d801d1020..970560a35 100644 --- a/src/g_input.h +++ b/src/g_input.h @@ -41,10 +41,12 @@ typedef enum KEY_DBLJOY1 = KEY_DBLMOUSE1 + MOUSEBUTTONS, KEY_DBLHAT1 = KEY_DBLJOY1 + JOYBUTTONS, - KEY_2JOY1 = KEY_DBLHAT1 + MOUSEBUTTONS, + KEY_2MOUSE1 = KEY_DBLHAT1 + JOYHATS*4, + KEY_2JOY1 = KEY_2MOUSE1 + MOUSEBUTTONS, KEY_2HAT1 = KEY_2JOY1 + JOYBUTTONS, - KEY_DBL2JOY1 = KEY_2HAT1 + MOUSEBUTTONS, + KEY_DBL2MOUSE1 = KEY_2HAT1 + JOYHATS*4, + KEY_DBL2JOY1 = KEY_DBL2MOUSE1 + MOUSEBUTTONS, KEY_DBL2HAT1 = KEY_DBL2JOY1 + JOYBUTTONS, KEY_3JOY1 = KEY_DBL2HAT1 + JOYHATS*4, @@ -61,8 +63,10 @@ typedef enum KEY_MOUSEWHEELUP = KEY_DBL4HAT1 + JOYHATS*4, KEY_MOUSEWHEELDOWN = KEY_MOUSEWHEELUP + 1, + KEY_2MOUSEWHEELUP = KEY_MOUSEWHEELDOWN + 1, + KEY_2MOUSEWHEELDOWN = KEY_2MOUSEWHEELUP + 1, - NUMINPUTS = KEY_MOUSEWHEELDOWN + 1, + NUMINPUTS = KEY_2MOUSEWHEELDOWN + 1, // FIXME: all the mouse 2 stuff should be removed, but it screws up mappings somehow } key_input_e; typedef enum @@ -113,8 +117,7 @@ extern consvar_t cv_gamepadled[MAXSPLITSCREENPLAYERS]; extern INT32 mousex, mousey; extern INT32 mlooky; //mousey with mlookSensitivity -extern INT32 joyxmove[JOYAXISSET], joyymove[JOYAXISSET], joy2xmove[JOYAXISSET], joy2ymove[JOYAXISSET], - joy3xmove[JOYAXISSET], joy3ymove[JOYAXISSET], joy4xmove[JOYAXISSET], joy4ymove[JOYAXISSET]; +extern INT32 joyxmove[MAXSPLITSCREENPLAYERS][JOYAXISSET], joyymove[MAXSPLITSCREENPLAYERS][JOYAXISSET]; // current state of the keys: true if pushed extern UINT8 gamekeydown[NUMINPUTS];