From 3ee5cc942b8a22363d5efbc2a87e26ddbf715ad2 Mon Sep 17 00:00:00 2001 From: Ensiform Date: Mon, 24 Oct 2022 18:13:14 -0500 Subject: [PATCH] And including the rest of the cvars from last commit --- src/sdl/sdl_glimp.c | 10 ++++++---- src/sdl/sdl_input.c | 39 +++++++++++++++++++++++++++++++++------ src/sdl/sdl_snd.c | 2 ++ src/server/sv_init.c | 25 +++++++++++++++++++++++-- src/unix/linux_glimp.c | 12 +++++++----- src/unix/linux_snd.c | 25 +++++++++++++++---------- src/win32/win_glimp.c | 3 +++ src/win32/win_input.c | 10 +++++++++- src/win32/win_wndproc.c | 1 + 9 files changed, 99 insertions(+), 28 deletions(-) diff --git a/src/sdl/sdl_glimp.c b/src/sdl/sdl_glimp.c index 24f71c33..8656d290 100644 --- a/src/sdl/sdl_glimp.c +++ b/src/sdl/sdl_glimp.c @@ -622,13 +622,15 @@ void GLimp_Init( glconfig_t *config ) glw_state.config = config; // feedback renderer configuration in_nograb = Cvar_Get( "in_nograb", "0", 0 ); - - Cvar_SetDescription( in_nograb, "Prevents input grabbing" ); + Cvar_SetDescription( in_nograb, "Do not capture mouse in game, may be useful during online streaming" ); r_allowSoftwareGL = Cvar_Get( "r_allowSoftwareGL", "0", CVAR_LATCH ); + Cvar_SetDescription( r_allowSoftwareGL, "Toggle the use of the default software OpenGL driver supplied by the Operating System" ); r_swapInterval = Cvar_Get( "r_swapInterval", "0", CVAR_ARCHIVE | CVAR_LATCH ); + Cvar_SetDescription( r_swapInterval, "V-blanks to wait before swapping buffers\n 0: No V-Sync\n 1: Synced to the monitor's refresh rate" ); r_stereoEnabled = Cvar_Get( "r_stereoEnabled", "0", CVAR_ARCHIVE | CVAR_LATCH ); + Cvar_SetDescription( r_stereoEnabled, "Enable stereo rendering for techniques like shutter glasses" ); // Create the window and set up the context err = GLimp_StartDriverAndSetMode( r_mode->integer, r_modeFullscreen->string, r_fullscreen->integer, qfalse ); @@ -717,11 +719,11 @@ void VKimp_Init( glconfig_t *config ) Com_DPrintf( "VKimp_Init()\n" ); in_nograb = Cvar_Get( "in_nograb", "0", 0 ); - - Cvar_SetDescription( in_nograb, "Prevents input grabbing" ); + Cvar_SetDescription( in_nograb, "Do not capture mouse in game, may be useful during online streaming" ); r_swapInterval = Cvar_Get( "r_swapInterval", "0", CVAR_ARCHIVE | CVAR_LATCH ); r_stereoEnabled = Cvar_Get( "r_stereoEnabled", "0", CVAR_ARCHIVE | CVAR_LATCH ); + Cvar_SetDescription( r_stereoEnabled, "Enable stereo rendering for techniques like shutter glasses" ); // feedback to renderer configuration glw_state.config = config; diff --git a/src/sdl/sdl_input.c b/src/sdl/sdl_input.c index 759a3889..b9c814a7 100644 --- a/src/sdl/sdl_input.c +++ b/src/sdl/sdl_input.c @@ -555,6 +555,7 @@ static void IN_InitJoystick( void ) int i = 0; int total = 0; char buf[16384] = ""; + cvar_t *cv; if (gamepad) SDL_GameControllerClose(gamepad); @@ -602,7 +603,11 @@ static void IN_InitJoystick( void ) Q_strcat(buf, sizeof(buf), "\n"); } - Cvar_Get( "in_availableJoysticks", buf, CVAR_ROM ); + cv = Cvar_Get( "in_availableJoysticks", "", CVAR_ROM ); + Cvar_SetDescription( cv, "List of available Joysticks" ); + + // Update cvar on in_restart or controller add/remove. + Cvar_Set( "in_availableJoysticks", buf ); if( !in_joystick->integer ) { Com_DPrintf( "Joystick is not active.\n" ); @@ -611,10 +616,13 @@ static void IN_InitJoystick( void ) } in_joystickNo = Cvar_Get( "in_joystickNo", "0", CVAR_ARCHIVE ); + Cvar_SetDescription( in_joystickNo, "Select which joystick to use" ); if( in_joystickNo->integer < 0 || in_joystickNo->integer >= total ) Cvar_Set( "in_joystickNo", "0" ); in_joystickUseAnalog = Cvar_Get( "in_joystickUseAnalog", "0", CVAR_ARCHIVE ); + Cvar_SetDescription( in_joystickUseAnalog, "Do not translate joystick axis events to keyboard commands" ); + in_joystickThreshold = Cvar_Get( "joy_threshold", "0.15", CVAR_ARCHIVE ); stick = SDL_JoystickOpen( in_joystickNo->integer ); @@ -1389,37 +1397,56 @@ void IN_Init( void ) Com_DPrintf( "\n------- Input Initialization -------\n" ); in_keyboardDebug = Cvar_Get( "in_keyboardDebug", "0", CVAR_ARCHIVE ); + Cvar_SetDescription( in_keyboardDebug, "Print keyboard debug info" ); in_forceCharset = Cvar_Get( "in_forceCharset", "0", CVAR_ARCHIVE_ND ); + Cvar_SetDescription( in_forceCharset, "Try to translate non-ASCII chars in keyboard input or force EN/US keyboard layout" ); // mouse variables in_mouse = Cvar_Get( "in_mouse", "1", CVAR_ARCHIVE ); Cvar_CheckRange( in_mouse, "-1", "1", CV_INTEGER ); + Cvar_SetDescription( in_mouse, + "Mouse data input source:\n" \ + " -1 - SDL mouse (relative mode disabled)\n" \ + " 0 - disable mouse input\n" \ + " 1 - SDL raw mouse (relative mode)" ); #ifdef USE_JOYSTICK in_joystick = Cvar_Get( "in_joystick", "0", CVAR_ARCHIVE|CVAR_LATCH ); + Cvar_SetDescription( in_joystick, "Whether or not joystick support is on" ); in_joystickThreshold = Cvar_Get( "joy_threshold", "0.15", CVAR_ARCHIVE ); + Cvar_SetDescription( in_joystickThreshold, "Threshold of joystick moving dictance" ); j_pitch = Cvar_Get( "j_pitch", "0.022", CVAR_ARCHIVE_ND ); + Cvar_SetDescription( j_pitch, "Joystick pitch rotation speed/direction" ); j_yaw = Cvar_Get( "j_yaw", "-0.022", CVAR_ARCHIVE_ND ); + Cvar_SetDescription( j_yaw, "Joystick yaw rotation speed/direction" ); j_forward = Cvar_Get( "j_forward", "-0.25", CVAR_ARCHIVE_ND ); + Cvar_SetDescription( j_forward, "Joystick forward movement speed/direction" ); j_side = Cvar_Get( "j_side", "0.25", CVAR_ARCHIVE_ND ); + Cvar_SetDescription( j_side, "Joystick side movement speed/direction" ); j_up = Cvar_Get( "j_up", "0", CVAR_ARCHIVE_ND ); + Cvar_SetDescription( j_up, "Joystick up movement speed/direction" ); j_pitch_axis = Cvar_Get( "j_pitch_axis", "3", CVAR_ARCHIVE_ND ); - j_yaw_axis = Cvar_Get( "j_yaw_axis", "2", CVAR_ARCHIVE_ND ); - j_forward_axis = Cvar_Get( "j_forward_axis", "1", CVAR_ARCHIVE_ND ); - j_side_axis = Cvar_Get( "j_side_axis", "0", CVAR_ARCHIVE_ND ); - j_up_axis = Cvar_Get( "j_up_axis", "4", CVAR_ARCHIVE_ND ); - Cvar_CheckRange( j_pitch_axis, "0", va("%i",MAX_JOYSTICK_AXIS-1), CV_INTEGER ); + Cvar_SetDescription( j_pitch_axis, "Selects which joystick axis controls pitch" ); + j_yaw_axis = Cvar_Get( "j_yaw_axis", "2", CVAR_ARCHIVE_ND ); Cvar_CheckRange( j_yaw_axis, "0", va("%i",MAX_JOYSTICK_AXIS-1), CV_INTEGER ); + Cvar_SetDescription( j_yaw_axis, "Selects which joystick axis controls yaw" ); + j_forward_axis = Cvar_Get( "j_forward_axis", "1", CVAR_ARCHIVE_ND ); Cvar_CheckRange( j_forward_axis, "0", va("%i",MAX_JOYSTICK_AXIS-1), CV_INTEGER ); + Cvar_SetDescription( j_forward_axis, "Selects which joystick axis controls forward/back" ); + j_side_axis = Cvar_Get( "j_side_axis", "0", CVAR_ARCHIVE_ND ); Cvar_CheckRange( j_side_axis, "0", va("%i",MAX_JOYSTICK_AXIS-1), CV_INTEGER ); + Cvar_SetDescription( j_side_axis, "Selects which joystick axis controls left/right" ); + j_up_axis = Cvar_Get( "j_up_axis", "4", CVAR_ARCHIVE_ND ); Cvar_CheckRange( j_up_axis, "0", va("%i",MAX_JOYSTICK_AXIS-1), CV_INTEGER ); + Cvar_SetDescription( j_up_axis, "Selects which joystick axis controls up/down" ); #endif // ~ and `, as keys and characters cl_consoleKeys = Cvar_Get( "cl_consoleKeys", "~ ` 0x7e 0x60", CVAR_ARCHIVE ); + Cvar_SetDescription( cl_consoleKeys, "Space delimited list of key names or characters that toggle the console" ); mouseAvailable = ( in_mouse->value != 0 ) ? qtrue : qfalse; diff --git a/src/sdl/sdl_snd.c b/src/sdl/sdl_snd.c index 59d0a3cb..d017de9a 100644 --- a/src/sdl/sdl_snd.c +++ b/src/sdl/sdl_snd.c @@ -247,7 +247,9 @@ qboolean SNDDMA_Init( void ) return qtrue; s_sdlDevSamps = Cvar_Get( "s_sdlDevSamps", "0", CVAR_ARCHIVE_ND | CVAR_LATCH ); + Cvar_SetDescription( s_sdlDevSamps, "SDL DMA buffer size override" ); s_sdlMixSamps = Cvar_Get( "s_sdlMixSamps", "0", CVAR_ARCHIVE_ND | CVAR_LATCH ); + Cvar_SetDescription( s_sdlMixSamps, "SDL mix buffer size override" ); s_sdlLevelSamps = Cvar_Get( "s_sdlLevelSamps", "0", CVAR_ARCHIVE_ND | CVAR_LATCH ); Cvar_CheckRange( s_sdlLevelSamps, "0", "2", CV_INTEGER ); diff --git a/src/server/sv_init.c b/src/server/sv_init.c index dad3ff2a..3e6bf5ab 100644 --- a/src/server/sv_init.c +++ b/src/server/sv_init.c @@ -903,22 +903,30 @@ void SV_Init( void ) Cvar_Get( "sv_keywords", "", CVAR_SERVERINFO ); //Cvar_Get( "protocol", va( "%i", PROTOCOL_VERSION ), CVAR_SERVERINFO | CVAR_ROM ); sv_mapname = Cvar_Get( "mapname", "nomap", CVAR_SERVERINFO | CVAR_ROM ); + Cvar_SetDescription( sv_mapname, "Display the name of the current map being used on a server" ); sv_privateClients = Cvar_Get( "sv_privateClients", "0", CVAR_SERVERINFO ); Cvar_CheckRange( sv_privateClients, "0", va( "%i", MAX_CLIENTS-1 ), CV_INTEGER ); + Cvar_SetDescription( sv_privateClients, "The number of spots, out of sv_maxclients, reserved for players with the server password (sv_privatePassword)" ); sv_hostname = Cvar_Get( "sv_hostname", "ETHost", CVAR_SERVERINFO | CVAR_ARCHIVE ); + Cvar_SetDescription( sv_hostname, "Sets the name of the server" ); sv_maxclients = Cvar_Get( "sv_maxclients", "20", CVAR_SERVERINFO | CVAR_LATCH ); // NERVE - SMF - changed to 20 from 8 Cvar_CheckRange( sv_maxclients, "1", XSTRING(MAX_CLIENTS), CV_INTEGER ); + Cvar_SetDescription( sv_maxclients, "Maximum number of people allowed to join the server dedicated server" ); sv_maxclientsPerIP = Cvar_Get( "sv_maxclientsPerIP", "3", CVAR_ARCHIVE ); Cvar_CheckRange( sv_maxclientsPerIP, "1", NULL, CV_INTEGER ); - Cvar_SetDescription( sv_maxclientsPerIP, "Limits number of simultaneous connections from the same IP address." ); + Cvar_SetDescription( sv_maxclientsPerIP, "Limits number of simultaneous connections from the same IP address" ); sv_clientTLD = Cvar_Get( "sv_clientTLD", "0", CVAR_ARCHIVE_ND ); Cvar_CheckRange( sv_clientTLD, NULL, NULL, CV_INTEGER ); + Cvar_SetDescription( sv_clientTLD, "Client country detection code" ); sv_minRate = Cvar_Get( "sv_minRate", "0", CVAR_ARCHIVE_ND | CVAR_SERVERINFO ); + Cvar_SetDescription( sv_minRate, "Minimum server bandwidth (in bit per second) a client can use" ); sv_maxRate = Cvar_Get( "sv_maxRate", "0", CVAR_ARCHIVE_ND | CVAR_SERVERINFO ); + Cvar_SetDescription( sv_maxRate, "Maximum server bandwidth (in bit per second) a client can use" ); sv_floodProtect = Cvar_Get( "sv_floodProtect", "1", CVAR_ARCHIVE | CVAR_SERVERINFO ); + Cvar_SetDescription( sv_floodProtect, "Toggle server flood protection to keep players from bringing the server down" ); sv_friendlyFire = Cvar_Get( "g_friendlyFire", "1", CVAR_SERVERINFO | CVAR_ARCHIVE ); // NERVE - SMF sv_maxlives = Cvar_Get( "g_maxlives", "0", CVAR_ARCHIVE | CVAR_LATCH | CVAR_SERVERINFO ); // NERVE - SMF sv_needpass = Cvar_Get( "g_needpass", "0", CVAR_SERVERINFO | CVAR_ROM ); @@ -926,7 +934,7 @@ void SV_Init( void ) // systeminfo //bani - added cvar_t for sv_cheats so server engine can reference it sv_cheats = Cvar_Get( "sv_cheats", "1", CVAR_SYSTEMINFO | CVAR_ROM ); - Cvar_SetDescription( sv_cheats, "Allow cheats" ); + Cvar_SetDescription( sv_cheats, "Enable cheating commands (serverside or demo playback only)" ); sv_serverid = Cvar_Get( "sv_serverid", "0", CVAR_SYSTEMINFO | CVAR_ROM ); sv_pure = Cvar_Get( "sv_pure", "1", CVAR_SYSTEMINFO | CVAR_LATCH ); Cvar_SetDescription( sv_pure, "Pure server client file checksum verification:\n" @@ -936,10 +944,13 @@ void SV_Init( void ) Cvar_Get( "sv_pakNames", "", CVAR_SYSTEMINFO | CVAR_ROM ); Cvar_Get( "sv_referencedPaks", "", CVAR_SYSTEMINFO | CVAR_ROM ); sv_referencedPakNames = Cvar_Get( "sv_referencedPakNames", "", CVAR_SYSTEMINFO | CVAR_ROM ); + Cvar_SetDescription( sv_referencedPakNames, "Variable holds a list of all the pk3 files the server loaded data from" ); // server vars sv_rconPassword = Cvar_Get( "rconPassword", "", CVAR_TEMP ); + Cvar_SetDescription( sv_rconPassword, "Password for remote server commands" ); sv_privatePassword = Cvar_Get( "sv_privatePassword", "", CVAR_TEMP ); + Cvar_SetDescription( sv_privatePassword, "Set password for private clients to login with" ); sv_fps = Cvar_Get( "sv_fps", "20", CVAR_TEMP ); Cvar_CheckRange( sv_fps, "10", "125", CV_INTEGER ); Cvar_SetDescription( sv_fps, "Frames per second the server runs at" ); @@ -952,6 +963,7 @@ void SV_Init( void ) Cvar_Get ("nextmap", "", CVAR_TEMP ); sv_allowDownload = Cvar_Get( "sv_allowDownload", "1", CVAR_ARCHIVE|CVAR_SERVERINFO ); + Cvar_SetDescription( sv_allowDownload, "Toggle the ability for clients to download files maps etc. from server" ); Cvar_Get( "sv_dlURL", "", CVAR_SERVERINFO | CVAR_ARCHIVE ); // moved to Com_Init() @@ -962,12 +974,17 @@ void SV_Init( void ) sv_master[4] = Cvar_Get( "sv_master5", "", CVAR_ARCHIVE_ND ); sv_reconnectlimit = Cvar_Get( "sv_reconnectlimit", "3", 0 ); Cvar_CheckRange( sv_reconnectlimit, "0", "12", CV_INTEGER ); + Cvar_SetDescription( sv_reconnectlimit, "Number of seconds a disconnected client should wait before next reconnect" ); sv_tempbanmessage = Cvar_Get( "sv_tempbanmessage", "You have been kicked and are temporarily banned from joining this server.", 0 ); sv_padPackets = Cvar_Get( "sv_padPackets", "0", CVAR_DEVELOPER ); + Cvar_SetDescription( sv_padPackets, "Adds padding bytes to network packets for rate debugging" ); sv_killserver = Cvar_Get( "sv_killserver", "0", 0 ); + Cvar_SetDescription( sv_killserver, "Internal flag to manage server state" ); sv_mapChecksum = Cvar_Get( "sv_mapChecksum", "", CVAR_ROM ); + Cvar_SetDescription( sv_mapChecksum, "Checksum of the currently loaded map" ); sv_lanForceRate = Cvar_Get( "sv_lanForceRate", "1", CVAR_ARCHIVE_ND ); + Cvar_SetDescription( sv_lanForceRate, "Forces LAN clients to the maximum rate instead of accepting client setting" ); sv_onlyVisibleClients = Cvar_Get( "sv_onlyVisibleClients", "0", 0 ); // DHM - Nerve @@ -1007,6 +1024,8 @@ void SV_Init( void ) // the download netcode tops at 18/20 kb/s, no need to make you think you can go above sv_dl_maxRate = Cvar_Get( "sv_dl_maxRate", "42000", CVAR_ARCHIVE ); + //Cvar_CheckRange( sv_dl_maxRate, "0", "100000", CV_INTEGER ); + Cvar_SetDescription( sv_dl_maxRate, "Bandwidth allotted to PK3 file downloads via UDP, in byte/s" ); sv_wwwDownload = Cvar_Get( "sv_wwwDownload", "0", CVAR_ARCHIVE ); sv_wwwBaseURL = Cvar_Get( "sv_wwwBaseURL", "", CVAR_ARCHIVE ); @@ -1019,6 +1038,7 @@ void SV_Init( void ) #ifdef USE_BANS sv_banFile = Cvar_Get("sv_banFile", "serverbans.dat", CVAR_ARCHIVE); + Cvar_SetDescription( sv_banFile, "Name of the file that is used for storing the server bans" ); #endif sv_levelTimeReset = Cvar_Get( "sv_levelTimeReset", "0", CVAR_ARCHIVE_ND ); @@ -1028,6 +1048,7 @@ void SV_Init( void ) " however it may be necessary to disable in case of troubles with custom mods similar to ettv" ); sv_filter = Cvar_Get( "sv_filter", "filter.txt", CVAR_ARCHIVE ); + Cvar_SetDescription( sv_filter, "Cvar that point to filter file, if it is "" then filtering will be disabled" ); sv_filterCommands = Cvar_Get( "sv_filterCommands", "1", CVAR_ARCHIVE ); Cvar_CheckRange( sv_filterCommands, "0", "2", CV_INTEGER ); diff --git a/src/unix/linux_glimp.c b/src/unix/linux_glimp.c index abf7960c..b9a6aff9 100644 --- a/src/unix/linux_glimp.c +++ b/src/unix/linux_glimp.c @@ -1862,16 +1862,18 @@ static void InitCvars( void ) { // referenced in GLW_StartDriverAndSetMode() so must be inited there in_nograb = Cvar_Get( "in_nograb", "0", 0 ); - - Cvar_SetDescription( in_nograb, "Prevents input grabbing" ); + Cvar_SetDescription( in_nograb, "Do not capture mouse in game, may be useful during online streaming" ); // turn on-off sub-frame timing of X events, referenced in Sys_XTimeToSysTime in_subframe = Cvar_Get( "in_subframe", "1", CVAR_ARCHIVE_ND ); + Cvar_SetDescription( in_subframe, "Toggle X sub-frame event handling" ); in_dgamouse = Cvar_Get( "in_dgamouse", "1", CVAR_ARCHIVE_ND ); + Cvar_SetDescription( in_dgamouse, "DGA Mouse support" ); in_shiftedKeys = Cvar_Get( "in_shiftedKeys", "0", CVAR_ARCHIVE_ND ); in_forceCharset = Cvar_Get( "in_forceCharset", "0", CVAR_ARCHIVE_ND ); + Cvar_SetDescription( in_forceCharset, "Try to translate non-ASCII chars in keyboard input or force EN/US keyboard layout" ); } @@ -2052,13 +2054,11 @@ void IN_Init( void ) // mouse variables in_mouse = Cvar_Get( "in_mouse", "1", CVAR_ARCHIVE ); - Cvar_CheckRange( in_mouse, "0", "1", CV_INTEGER ); - Cvar_SetDescription( in_mouse, "Mouse data input source:\n" \ " 0 - disable mouse input\n" \ - " 1 - xi/raw mouse" ); + " 1 - enable mouse input" ); if ( in_mouse->integer ) { @@ -2072,9 +2072,11 @@ void IN_Init( void ) #ifdef USE_JOYSTICK // bk001130 - from cvs.17 (mkv), joystick variables in_joystick = Cvar_Get( "in_joystick", "0", CVAR_ARCHIVE_ND | CVAR_LATCH ); + Cvar_SetDescription( in_joystick, "Whether or not joystick support is on" ); // bk001130 - changed this to match win32 in_joystickDebug = Cvar_Get( "in_debugjoystick", "0", CVAR_TEMP ); joy_threshold = Cvar_Get( "joy_threshold", "0.15", CVAR_ARCHIVE_ND ); // FIXME: in_joythreshold + Cvar_SetDescription( joy_threshold, "Threshold of joystick moving dictance" ); IN_StartupJoystick(); // bk001130 - from cvs1.17 (mkv) #endif diff --git a/src/unix/linux_snd.c b/src/unix/linux_snd.c index da64ac35..ec7137a7 100644 --- a/src/unix/linux_snd.c +++ b/src/unix/linux_snd.c @@ -1151,12 +1151,20 @@ void Snd_Memset( void* dest, const int val, const size_t count ) Com_Memset( dest, val, count ); } -qboolean SNDDMA_Init( void ) +static int SNDDMA_KHzToHz( int khz ) { - cvar_t *sndbits; - cvar_t *sndspeed; - cvar_t *sndchannels; + switch ( khz ) + { + case 48: return 48000; + case 44: return 44100; + default: + case 22: return 22050; + case 11: return 11025; + } +} +qboolean SNDDMA_Init( void ) +{ struct audio_buf_info info; int rc; int fmt; @@ -1167,9 +1175,6 @@ qboolean SNDDMA_Init( void ) if (snd_inited) return qtrue; - sndbits = Cvar_Get("sndbits", "16", CVAR_ARCHIVE_ND | CVAR_LATCH); - sndspeed = Cvar_Get("sndspeed", "0", CVAR_ARCHIVE_ND | CVAR_LATCH); - sndchannels = Cvar_Get("sndchannels", "2", CVAR_ARCHIVE_ND | CVAR_LATCH); snddevice = Cvar_Get("snddevice", "/dev/dsp", CVAR_ARCHIVE_ND | CVAR_LATCH); map_size = 0; @@ -1201,7 +1206,7 @@ qboolean SNDDMA_Init( void ) /* SNDCTL_DSP_GETOSPACE moved to be called later */ // set sample bits & speed - dma.samplebits = (int)sndbits->value; + dma.samplebits = (int)s_bits->value; if (dma.samplebits != 16 && dma.samplebits != 8) { ioctl(audio_fd, SNDCTL_DSP_GETFMTS, &fmt); if (fmt & AFMT_S16_LE) @@ -1210,7 +1215,7 @@ qboolean SNDDMA_Init( void ) dma.samplebits = 8; } - dma.speed = (int)sndspeed->value; + dma.speed = SNDDMA_KHzToHz( s_khz->integer ); if (!dma.speed) { for (i=0 ; ivalue; + dma.channels = (int)s_numchannels->value; if (dma.channels < 1 || dma.channels > 2) dma.channels = 2; diff --git a/src/win32/win_glimp.c b/src/win32/win_glimp.c index 490e2d0e..5c37fcf9 100644 --- a/src/win32/win_glimp.c +++ b/src/win32/win_glimp.c @@ -1447,8 +1447,11 @@ void GLimp_Init( glconfig_t *config ) // glimp-specific r_maskMinidriver = Cvar_Get( "r_maskMinidriver", "0", CVAR_LATCH ); + Cvar_SetDescription( r_maskMinidriver, "If set to 1, then a mini driver will be treated as a normal ICD" ); r_stereoEnabled = Cvar_Get( "r_stereoEnabled", "0", CVAR_ARCHIVE_ND | CVAR_LATCH ); + Cvar_SetDescription( r_stereoEnabled, "Enable stereo rendering for techniques like shutter glasses" ); r_verbose = Cvar_Get( "r_verbose", "0", 0 ); + Cvar_SetDescription( r_verbose, "Turns on additional startup information when renderer is starting up" ); // feedback to renderer configuration glw_state.config = config; diff --git a/src/win32/win_input.c b/src/win32/win_input.c index 2796c4c2..cd583f0e 100644 --- a/src/win32/win_input.c +++ b/src/win32/win_input.c @@ -1169,17 +1169,23 @@ void IN_Init( void ) { // MIDI input controler variables in_midi = Cvar_Get( "in_midi", "0", CVAR_ARCHIVE ); in_midiport = Cvar_Get( "in_midiport", "1", CVAR_ARCHIVE ); + Cvar_SetDescription( in_midiport, "Toggle the use of a midi port as an input device" ); in_midichannel = Cvar_Get( "in_midichannel", "1", CVAR_ARCHIVE ); + Cvar_SetDescription( in_midichannel, "Toggle the use of a midi channel as an input device" ); in_mididevice = Cvar_Get( "in_mididevice", "0", CVAR_ARCHIVE ); + Cvar_SetDescription( in_mididevice, "Toggle the use of a midi device as an input device" ); Cmd_AddCommand( "midiinfo", MidiInfo_f ); #endif #ifdef USE_JOYSTICK // joystick variables in_joystick = Cvar_Get( "in_joystick", "0", CVAR_ARCHIVE | CVAR_LATCH ); + Cvar_SetDescription( in_joystick, "Whether or not joystick support is on" ); in_joyBallScale = Cvar_Get( "in_joyBallScale", "0.02", CVAR_ARCHIVE ); + Cvar_SetDescription( in_joyBallScale, "Sets the scale of a joyball rotation to player model rotation" ); in_debugJoystick = Cvar_Get( "in_debugjoystick", "0", CVAR_TEMP ); joy_threshold = Cvar_Get( "joy_threshold", "0.15", CVAR_ARCHIVE ); + Cvar_SetDescription( joy_threshold, "Threshold of joystick moving dictance" ); #endif // mouse variables @@ -1192,7 +1198,7 @@ void IN_Init( void ) { " -1 - win32 mouse" ); in_nograb = Cvar_Get( "in_nograb", "0", 0 ); - Cvar_SetDescription( in_nograb, "Prevents input grabbing" ); + Cvar_SetDescription( in_nograb, "Do not capture mouse in game, may be useful during online streaming" ); in_lagged = Cvar_Get( "in_lagged", "0", 0 ); Cvar_SetDescription( in_lagged, "Mouse movement processing order:\n" \ @@ -1200,8 +1206,10 @@ void IN_Init( void ) { " 1 - before framerate limiter" ); in_logitechbug = Cvar_Get( "in_logitechbug", "0", CVAR_ARCHIVE_ND ); + Cvar_SetDescription( in_logitechbug, "Toggle the use of special code in the game that addresses a bug in the logitech mouse driver software" ); in_minimize = Cvar_Get( "in_minimize", "", CVAR_ARCHIVE | CVAR_LATCH ); + Cvar_SetDescription( in_minimize, "Global Hotkey for minimize/restore main window" ); Cmd_AddCommand( "minimize", IN_Minimize ); Cmd_AddCommand( "in_restart", IN_Restart_f ); diff --git a/src/win32/win_wndproc.c b/src/win32/win_wndproc.c index 69acb323..9ef321e3 100644 --- a/src/win32/win_wndproc.c +++ b/src/win32/win_wndproc.c @@ -714,6 +714,7 @@ LRESULT WINAPI MainWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam uTimerT = 0; in_forceCharset = Cvar_Get( "in_forceCharset", "0", CVAR_ARCHIVE_ND ); + Cvar_SetDescription( in_forceCharset, "Try to translate non-ASCII chars in keyboard input or force EN/US keyboard layout" ); break; #if 0