diff --git a/src/d_netcmd.c b/src/d_netcmd.c index fd97b0259..6495ad7c3 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -290,7 +290,14 @@ consvar_t cv_skipmapcheck = {"skipmapcheck", "Off", CV_SAVE, CV_OnOff, NULL, 0, INT32 cv_debug; -consvar_t cv_usemouse = {"use_mouse", "Off", CV_SAVE|CV_CALL,usemouse_cons_t, I_StartupMouse, 0, NULL, NULL, 0, 0, NULL}; +static void UseMouse_OnChange(void); +consvar_t cv_usemouse = {"use_mouse", "Off", CV_SAVE|CV_CALL,usemouse_cons_t, UseMouse_OnChange, 0, NULL, NULL, 0, 0, NULL}; + +static void UseMouse_OnChange(void) +{ + GameFocus_menu_Onchange(); + I_StartupMouse(); +} //WTF consvar_t cv_mouseturn = {"mouseturn", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; diff --git a/src/m_menu.c b/src/m_menu.c index edf53662e..6c74cc27f 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -1768,7 +1768,7 @@ static menuitem_t OP_FocusOptionsMenu[] = {IT_STRING|IT_CVAR, NULL, "Show \"FOCUS LOST\"", &cv_showfocuslost, 80}, - {IT_STRING|IT_CVAR, NULL, "Hide mouse While Focused", &cv_alwaysgrabmouse, 100}, + {IT_STRING|IT_CVAR, NULL, "Always Grab Mouse While Focused", &cv_alwaysgrabmouse, 100}, }; static const char* OP_FocusOptionsTooltips[] = @@ -3590,6 +3590,11 @@ void SaturnHud_menu_Onchange(void) OP_SaturnHudMenu[sh_colorhud_customcolor].status = status; } +void GameFocus_menu_Onchange(void) +{ + OP_FocusOptionsMenu[5].status = cv_usemouse.value ? IT_GRAYEDOUT : IT_STRING | IT_CVAR; +} + #ifdef HWRENDER void M_UpdateOGLMenu(void) { diff --git a/src/m_menu.h b/src/m_menu.h index 4ee8615ce..45f0fbbf9 100644 --- a/src/m_menu.h +++ b/src/m_menu.h @@ -298,6 +298,8 @@ void Bird_menu_Onchange(void); // Saturn Hud menu updating void SaturnHud_menu_Onchange(void); +void GameFocus_menu_Onchange (void); + #ifdef HWRENDER void M_UpdateOGLMenu(void); #endif