From b649638400131b4fa8aaefb79313eace2312d6ec Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Wed, 13 Apr 2022 11:27:50 +0900 Subject: [PATCH] [joy] Clean up some redundant cvar flags No need to or CVAR_NONE with other flags. --- libs/video/targets/joy.c | 8 ++++---- libs/video/targets/joy_win.c | 7 +++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/libs/video/targets/joy.c b/libs/video/targets/joy.c index a7a55f6dd..3ff827726 100644 --- a/libs/video/targets/joy.c +++ b/libs/video/targets/joy.c @@ -466,12 +466,12 @@ JOY_Init_Cvars (void) int i; joy_device = Cvar_Get ("joy_device", "/dev/input/js0", - CVAR_NONE | CVAR_ROM, 0, "Joystick device"); - joy_enable = Cvar_Get ("joy_enable", "1", CVAR_NONE | CVAR_ARCHIVE, 0, + CVAR_ROM, 0, "Joystick device"); + joy_enable = Cvar_Get ("joy_enable", "1", CVAR_ARCHIVE, 0, "Joystick enable flag"); - joy_amp = Cvar_Get ("joy_amp", "1", CVAR_NONE | CVAR_ARCHIVE, joyamp_f, + joy_amp = Cvar_Get ("joy_amp", "1", CVAR_ARCHIVE, joyamp_f, "Joystick amplification"); - joy_pre_amp = Cvar_Get ("joy_pre_amp", "0.01", CVAR_NONE | CVAR_ARCHIVE, + joy_pre_amp = Cvar_Get ("joy_pre_amp", "0.01", CVAR_ARCHIVE, joyamp_f, "Joystick pre-amplification"); Cmd_AddCommand ("in_joy", in_joy_f, "Configures the joystick behaviour"); diff --git a/libs/video/targets/joy_win.c b/libs/video/targets/joy_win.c index babd2e270..f42b5022a 100644 --- a/libs/video/targets/joy_win.c +++ b/libs/video/targets/joy_win.c @@ -353,12 +353,11 @@ void JOY_Init_Cvars(void) { // joystick variables - joy_device = Cvar_Get ("joy_device", "none", CVAR_NONE | CVAR_ROM, 0, + joy_device = Cvar_Get ("joy_device", "none", CVAR_ROM, 0, "Joystick device"); - joy_enable = Cvar_Get ("joy_enable", "1", CVAR_NONE | CVAR_ARCHIVE, 0, + joy_enable = Cvar_Get ("joy_enable", "1", CVAR_ARCHIVE, 0, "Joystick enable flag"); - joy_sensitivity = Cvar_Get ("joy_sensitivity", "1", CVAR_NONE | - CVAR_ARCHIVE, 0, "Joystick sensitivity"); + joy_sensitivity = Cvar_Get ("joy_sensitivity", "1", CVAR_ARCHIVE, 0, "Joystick sensitivity"); in_joystick = Cvar_Get ("joystick", "0", CVAR_ARCHIVE, 0, "FIXME: No " "Description"); joy_name = Cvar_Get ("joyname", "joystick", CVAR_NONE, 0, "FIXME: No "