diff --git a/src/d_netcmd.c b/src/d_netcmd.c index 05e0e7038..420a20ab2 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -1003,7 +1003,7 @@ void D_RegisterClientCommands(void) CV_RegisterVar(&cv_usemouse); CV_RegisterVar(&cv_invertmouse); - CV_RegisterVar(&cv_mousesens); + CV_RegisterVar(&cv_mousexsens); CV_RegisterVar(&cv_mouseysens); CV_RegisterVar(&cv_mousevisible); diff --git a/src/g_game.c b/src/g_game.c index d4db31a02..42d774108 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -1127,7 +1127,7 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer) cmd->aiming = G_ClipAimingPitch(&laim); - mousex = mousey = mlooky = 0; + mousex = mousey = 0; if (forward > MAXPLMOVE) forward = MAXPLMOVE; diff --git a/src/g_input.c b/src/g_input.c index 2bec7b88b..a1adaf90c 100644 --- a/src/g_input.c +++ b/src/g_input.c @@ -34,7 +34,7 @@ static CV_PossibleValue_t onecontrolperkey_cons_t[] = {{1, "One"}, {2, "Several" static CV_PossibleValue_t turnsmooth_cons_t[] = {{2, "Slow"}, {1, "Fast"}, {0, "Off"}, {0, NULL}}; // mouse values are used once -consvar_t cv_mousesens = {"mousesens", "20", CV_SAVE, mousesens_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_mousexsens = {"mousexsens", "20", CV_SAVE, mousesens_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_mouseysens = {"mouseysens", "20", CV_SAVE, mousesens_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_controlperkey = {"controlperkey", "One", CV_SAVE, onecontrolperkey_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; @@ -126,7 +126,6 @@ static void led_off_handle4(void) } INT32 mousex = 0, mousey = 0; -INT32 mlooky = 0; // like mousey but with a custom sensitivity for mlook // joystick values are repeated INT32 joyxmove[MAXSPLITSCREENPLAYERS][JOYAXISSET] = {}; @@ -193,9 +192,8 @@ void G_MapEventsToControls(event_t *ev) case ev_mouse: // buttons are virtual keys if (menuactive || CON_Ready() || chat_on) break; - mousex = (INT32)(ev->data2*((cv_mousesens.value*cv_mousesens.value)/110.0f + 0.1f)); - mousey = (INT32)(ev->data3*((cv_mousesens.value*cv_mousesens.value)/110.0f + 0.1f)); - mlooky = (INT32)(ev->data3*((cv_mouseysens.value*cv_mousesens.value)/110.0f + 0.1f)); + mousex = (INT32)(ev->data2*((cv_mousexsens.value*cv_mousexsens.value)/110.0f + 0.1f)); + mousey = (INT32)(ev->data3*((cv_mouseysens.value*cv_mouseysens.value)/110.0f + 0.1f)); break; case ev_joystick: // buttons are virtual keys diff --git a/src/g_input.h b/src/g_input.h index 7e3258360..9831e6d8f 100644 --- a/src/g_input.h +++ b/src/g_input.h @@ -109,7 +109,7 @@ typedef enum } gamecontrols_e; // mouse values are used once -extern consvar_t cv_mousesens, cv_mouseysens; +extern consvar_t cv_mousexsens, cv_mouseysens; extern consvar_t cv_controlperkey; extern consvar_t cv_turnsmooth[MAXSPLITSCREENPLAYERS]; extern consvar_t cv_rumble[MAXSPLITSCREENPLAYERS]; @@ -117,7 +117,6 @@ extern consvar_t cv_rumblestrength[MAXSPLITSCREENPLAYERS]; extern consvar_t cv_gamepadled[MAXSPLITSCREENPLAYERS]; extern INT32 mousex, mousey; -extern INT32 mlooky; //mousey with mlookSensitivity extern INT32 joyxmove[MAXSPLITSCREENPLAYERS][JOYAXISSET], joyymove[MAXSPLITSCREENPLAYERS][JOYAXISSET]; diff --git a/src/m_menudefs.c b/src/m_menudefs.c index 867fc9be0..16991f629 100644 --- a/src/m_menudefs.c +++ b/src/m_menudefs.c @@ -800,7 +800,7 @@ static menuitem_t OP_MouseOptionsMenu[] = {IT_STRING | IT_CVAR, NULL, "Mouse Turning", &cv_mouseturn, 20}, {IT_STRING | IT_CVAR, NULL, "Invert Mouse", &cv_invertmouse, 30}, - {IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Mouse X Speed", &cv_mousesens, 40}, + {IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Mouse X Speed", &cv_mousexsens, 40}, {IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Mouse Y Speed", &cv_mouseysens, 50}, }; diff --git a/src/p_user.c b/src/p_user.c index ffe4d0e67..e026e5012 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -3263,7 +3263,7 @@ static ticcmd_t *P_CameraCmd(camera_t *cam, UINT8 num) axis = JoyAxis(AXISLOOK, forplayer); - laim += (mlooky<<19)*player_invert; + laim += (mousey<<19)*player_invert; if (InputDown(gc_lookup, forplayer) || (usejoystick && axis < 0)) { @@ -3302,7 +3302,7 @@ static ticcmd_t *P_CameraCmd(camera_t *cam, UINT8 num) cmd->aiming = G_ClipAimingPitch(&laim); } - mousex = mousey = mlooky = 0; + mousex = mousey = 0; if (forward > MAXPLMOVE) forward = MAXPLMOVE;