From 75aa40276f5575b1df428c04e1e3681c6f04fed4 Mon Sep 17 00:00:00 2001 From: Joseph Carter Date: Wed, 11 Apr 2001 00:10:19 +0000 Subject: [PATCH] A few more. Also removed a couple inaccurate comments. --- libs/audio/cd/cd_linux.c | 3 +- libs/audio/targets/snd_dma.c | 38 +++++++++++--------- libs/audio/targets/snd_null.c | 10 +++--- libs/util/qargs.c | 1 - nq/source/gl_draw.c | 2 +- nq/source/sv_cvar.c | 2 -- nq/source/vid_3dfxsvga.c | 1 - qw/source/cl_main.c | 8 ++--- qw/source/gl_draw.c | 7 ++-- qw/source/net_udp6.c | 1 - qw/source/sv_main.c | 66 +++++++++++++++++++++++------------ qw/source/vid_3dfxsvga.c | 1 - 12 files changed, 81 insertions(+), 59 deletions(-) diff --git a/libs/audio/cd/cd_linux.c b/libs/audio/cd/cd_linux.c index 88ad1b605..a45fb29f3 100644 --- a/libs/audio/cd/cd_linux.c +++ b/libs/audio/cd/cd_linux.c @@ -429,8 +429,7 @@ CDAudio_Init (void) #endif mus_cddevice = Cvar_Get("mus_cddevice", "/dev/cdrom", CVAR_NONE, - Mus_CDChange, - "device to use for CD music"); + Mus_CDChange, "device to use for CD music"); Cmd_AddCommand ("cd", CD_f, "Control the CD player.\n" "Commands:\n" diff --git a/libs/audio/targets/snd_dma.c b/libs/audio/targets/snd_dma.c index c5c9b3165..fc40cc207 100644 --- a/libs/audio/targets/snd_dma.c +++ b/libs/audio/targets/snd_dma.c @@ -275,46 +275,50 @@ S_Init (void) void S_Init_Cvars (void) { - snd_device = Cvar_Get ("snd_device", "", CVAR_ROM, 0, + snd_device = Cvar_Get ("snd_device", "", CVAR_ROM, NULL, "sound device. \"\" is system default"); - snd_rate = Cvar_Get ("snd_rate", "0", CVAR_ROM, 0, + snd_rate = Cvar_Get ("snd_rate", "0", CVAR_ROM, NULL, "sound playback rate. 0 is system default"); - snd_bits = Cvar_Get ("snd_bits", "0", CVAR_ROM, 0, + snd_bits = Cvar_Get ("snd_bits", "0", CVAR_ROM, NULL, "sound sample depth. 0 is system default"); - snd_stereo = Cvar_Get ("snd_stereo", "1", CVAR_ROM, 0, + snd_stereo = Cvar_Get ("snd_stereo", "1", CVAR_ROM, NULL, "sound stereo output"); - nosound = Cvar_Get ("nosound", "0", CVAR_NONE, 0, "Set to turn sound off"); + nosound = Cvar_Get ("nosound", "0", CVAR_NONE, NULL, + "Set to turn sound off"); volume = - Cvar_Get ("volume", "0.7", CVAR_ARCHIVE, 0, + Cvar_Get ("volume", "0.7", CVAR_ARCHIVE, NULL, "Set the volume for sound playback"); precache = - Cvar_Get ("precache", "1", CVAR_NONE, 0, "Toggle the use of a precache"); + Cvar_Get ("precache", "1", CVAR_NONE, NULL, + "Toggle the use of a precache"); loadas8bit = - Cvar_Get ("loadas8bit", "0", CVAR_NONE, 0, + Cvar_Get ("loadas8bit", "0", CVAR_NONE, NULL, "Toggles if sounds are loaded as 8-bit samples"); - bgmvolume = Cvar_Get ("bgmvolume", "1", CVAR_ARCHIVE, 0, "Volume of CD music"); + bgmvolume = Cvar_Get ("bgmvolume", "1", CVAR_ARCHIVE, NULL, + "Volume of CD music"); ambient_level = - Cvar_Get ("ambient_level", "0.3", CVAR_NONE, 0, "Ambient sounds' volume"); + Cvar_Get ("ambient_level", "0.3", CVAR_NONE, NULL, + "Ambient sounds' volume"); ambient_fade = - Cvar_Get ("ambient_fade", "100", CVAR_NONE, 0, + Cvar_Get ("ambient_fade", "100", CVAR_NONE, NULL, "How quickly ambient sounds fade in or out"); snd_noextraupdate = - Cvar_Get ("snd_noextraupdate", "0", CVAR_NONE, 0, + Cvar_Get ("snd_noextraupdate", "0", CVAR_NONE, NULL, "Toggles the correct value display in host_speeds. Usually messes up sound playback when in effect"); snd_show = - Cvar_Get ("snd_show", "0", CVAR_NONE, 0, + Cvar_Get ("snd_show", "0", CVAR_NONE, NULL, "Toggles the display of sounds currently being played"); snd_interp = - Cvar_Get ("snd_interp", "1", CVAR_ARCHIVE, 0, + Cvar_Get ("snd_interp", "1", CVAR_ARCHIVE, NULL, "control sample interpolation"); snd_phasesep = - Cvar_Get ("snd_phasesep", "0.0", CVAR_ARCHIVE, 0, + Cvar_Get ("snd_phasesep", "0.0", CVAR_ARCHIVE, NULL, "max stereo phase separation in ms. 0.6 is for 20cm head"); snd_volumesep = - Cvar_Get ("snd_volumesep", "1.0", CVAR_ARCHIVE, 0, + Cvar_Get ("snd_volumesep", "1.0", CVAR_ARCHIVE, NULL, "max stereo volume separation in ms. 1.0 is max"); _snd_mixahead = - Cvar_Get ("_snd_mixahead", "0.1", CVAR_ARCHIVE, 0, + Cvar_Get ("_snd_mixahead", "0.1", CVAR_ARCHIVE, NULL, "Delay time for sounds"); } diff --git a/libs/audio/targets/snd_null.c b/libs/audio/targets/snd_null.c index 65e6cbb0e..7ac898d05 100644 --- a/libs/audio/targets/snd_null.c +++ b/libs/audio/targets/snd_null.c @@ -57,11 +57,13 @@ S_Init (void) void S_Init_Cvars (void) { - volume = Cvar_Get ("volume", "0.7", CVAR_ARCHIVE, 0, "Volume level of sounds"); + volume = Cvar_Get ("volume", "0.7", CVAR_ARCHIVE, NULL, + "Volume level of sounds"); loadas8bit = - Cvar_Get ("loadas8bit", "0", CVAR_NONE, 0, "Load samples as 8-bit"); - bgmvolume = Cvar_Get ("bgmvolume", "1", CVAR_ARCHIVE, 0, "CD music volume"); - snd_interp = Cvar_Get ("snd_interp", "1", CVAR_ARCHIVE, 0, + Cvar_Get ("loadas8bit", "0", CVAR_NONE, NULL, "Load samples as 8-bit"); + bgmvolume = Cvar_Get ("bgmvolume", "1", CVAR_ARCHIVE, NULL, + "CD music volume"); + snd_interp = Cvar_Get ("snd_interp", "1", CVAR_ARCHIVE, NULL, "control sample interpolation"); } diff --git a/libs/util/qargs.c b/libs/util/qargs.c index 7ceab80e1..408cc92be 100644 --- a/libs/util/qargs.c +++ b/libs/util/qargs.c @@ -4,7 +4,6 @@ command line argument processing routines Copyright (C) 1996-1997 Id Software, Inc. - Copyright (C) 1999,2000 Nelson Rush. Copyright (C) 1999,2000 contributors of the QuakeForge project Please see the file "AUTHORS" for a list of contributors diff --git a/nq/source/gl_draw.c b/nq/source/gl_draw.c index a38192350..b6fe43417 100644 --- a/nq/source/gl_draw.c +++ b/nq/source/gl_draw.c @@ -418,7 +418,7 @@ Draw_Init (void) gl_nobind = Cvar_Get ("gl_nobind", "0", CVAR_NONE, NULL, "whether or not to inhibit texture binding"); gl_max_size = Cvar_Get ("gl_max_size", "1024", CVAR_NONE, NULL, "None"); - gl_picmip = Cvar_Get ("gl_picmip", "0", CVAR_NONE, 0, "None"); + gl_picmip = Cvar_Get ("gl_picmip", "0", CVAR_NONE, NULL, "None"); // Console effects --KB gl_constretch = Cvar_Get ("gl_constretch", "0", CVAR_ARCHIVE, NULL, diff --git a/nq/source/sv_cvar.c b/nq/source/sv_cvar.c index bafc9f47c..4da0bb079 100644 --- a/nq/source/sv_cvar.c +++ b/nq/source/sv_cvar.c @@ -1,11 +1,9 @@ - /* cvar.c dynamic variable tracking Copyright (C) 1996-1997 Id Software, Inc. - Copyright (C) 1999,2000 Nelson Rush. Copyright (C) 1999,2000 contributors of the QuakeForge project Please see the file "AUTHORS" for a list of contributors diff --git a/nq/source/vid_3dfxsvga.c b/nq/source/vid_3dfxsvga.c index 12db9886a..030d0a3dd 100644 --- a/nq/source/vid_3dfxsvga.c +++ b/nq/source/vid_3dfxsvga.c @@ -4,7 +4,6 @@ OpenGL device driver for 3Dfx chipsets running Linux Copyright (C) 1996-1997 Id Software, Inc. - Copyright (C) 1999,2000 Nelson Rush. Copyright (C) 1999,2000 contributors of the QuakeForge project Please see the file "AUTHORS" for a list of contributors diff --git a/qw/source/cl_main.c b/qw/source/cl_main.c index f94d19c38..f19e7c1da 100644 --- a/qw/source/cl_main.c +++ b/qw/source/cl_main.c @@ -1575,8 +1575,8 @@ Host_Init (void) // would have been nice if Cmd_Exec_f could have been used, but it // only reads from within the quake file system, and changing that is // probably Not A Good Thing (tm). - fs_globalcfg = Cvar_Get ("fs_globalcfg", FS_GLOBALCFG, - CVAR_ROM, NULL, "global configuration file"); + fs_globalcfg = Cvar_Get ("fs_globalcfg", FS_GLOBALCFG, CVAR_ROM, NULL, + "global configuration file"); Cmd_Exec_File (fs_globalcfg->string); Cbuf_Execute_Sets (); @@ -1584,8 +1584,8 @@ Host_Init (void) Cmd_StuffCmds_f (); Cbuf_Execute_Sets (); - fs_usercfg = Cvar_Get ("fs_usercfg", FS_USERCFG, - CVAR_ROM, NULL, "user configuration file"); + fs_usercfg = Cvar_Get ("fs_usercfg", FS_USERCFG, CVAR_ROM, NULL, + "user configuration file"); Cmd_Exec_File (fs_usercfg->string); Cbuf_Execute_Sets (); diff --git a/qw/source/gl_draw.c b/qw/source/gl_draw.c index d8616a647..b90895ebd 100644 --- a/qw/source/gl_draw.c +++ b/qw/source/gl_draw.c @@ -325,9 +325,10 @@ Draw_Init_Cvars (void) "alpha value for the console background"); gl_conspin = Cvar_Get ("gl_conspin", "0", CVAR_ARCHIVE, NULL, "speed at which the console spins"); - gl_lightmap_components = Cvar_Get ("gl_lightmap_components", "4", CVAR_ROM, 0, "Lightmap texture components. 1 is greyscale, 3 is RGB, 4 is RGBA."); - cl_verstring = Cvar_Get ("cl_verstring", PROGRAM " " VERSION, CVAR_NONE, NULL, - "Client version string"); + gl_lightmap_components = Cvar_Get ("gl_lightmap_components", "4", CVAR_ROM, + NULL, "Lightmap texture components. 1 is greyscale, 3 is RGB, 4 is RGBA."); + cl_verstring = Cvar_Get ("cl_verstring", PROGRAM " " VERSION, CVAR_NONE, + NULL, "Client version string"); } diff --git a/qw/source/net_udp6.c b/qw/source/net_udp6.c index 4695699ea..a5c708247 100644 --- a/qw/source/net_udp6.c +++ b/qw/source/net_udp6.c @@ -4,7 +4,6 @@ (description) Copyright (C) 1996-1997 Id Software, Inc. - Copyright (C) 1999,2000 Nelson Rush. Copyright (C) 2000 Marcus Sundberg [mackan@stacken.kth.se] Copyright (C) 1999,2000 contributors of the QuakeForge project Please see the file "AUTHORS" for a list of contributors diff --git a/qw/source/sv_main.c b/qw/source/sv_main.c index d37e424bd..1662655a3 100644 --- a/qw/source/sv_main.c +++ b/qw/source/sv_main.c @@ -1515,38 +1515,52 @@ SV_InitLocal (void) maxspectators = Cvar_Get ("maxspectators", "8", CVAR_SERVERINFO, Cvar_Info, "Sets how many spectators can connect to your server. The maxclients value takes precidence over this value so this" " value should always be equal-to or less-then the maxclients value"); - hostname = Cvar_Get ("hostname", "unnamed", CVAR_SERVERINFO, Cvar_Info, "Report or sets the server name"); + hostname = Cvar_Get ("hostname", "unnamed", CVAR_SERVERINFO, Cvar_Info, + "Report or sets the server name"); deathmatch = Cvar_Get ("deathmatch", "1", CVAR_SERVERINFO, Cvar_Info, "Sets the rules for weapon and item respawning. " "1 Does not leave weapons on the map. You can pickup weapons and items and they will respawn," "2 Leaves weapons on the map. You can only pick up a weapon once. Picked up items will not respawn," "3 Leaves weapons on the map. You can only pick up a weapon once. Picked up items will respawn."); - spawn = Cvar_Get ("spawn", "0", CVAR_SERVERINFO, Cvar_Info, "Spawn the player entity"); - watervis = Cvar_Get ("watervis", "0", CVAR_SERVERINFO, Cvar_Info, "Toggle the use of r_watervis by OpenGL clients"); + spawn = Cvar_Get ("spawn", "0", CVAR_SERVERINFO, Cvar_Info, + "Spawn the player entity"); + watervis = Cvar_Get ("watervis", "0", CVAR_SERVERINFO, Cvar_Info, + "Toggle the use of r_watervis by OpenGL clients"); timeout = Cvar_Get ("timeout", "65", CVAR_NONE, NULL, "Sets the amount of time in seconds before a client is considered disconnected if the server does not receive a packet"); zombietime = Cvar_Get ("zombietime", "2", CVAR_NONE, NULL, "The number of seconds that the server will keep the character of a player on the map who seems to have disconnected"); - sv_maxvelocity = Cvar_Get ("sv_maxvelocity", "2000", CVAR_NONE, NULL, "Sets the maximum velocity an object can travel"); - sv_gravity = Cvar_Get ("sv_gravity", "800", CVAR_NONE, NULL, "Sets the global value for the amount of gravity"); + sv_maxvelocity = Cvar_Get ("sv_maxvelocity", "2000", CVAR_NONE, NULL, + "Sets the maximum velocity an object can travel"); + sv_gravity = Cvar_Get ("sv_gravity", "800", CVAR_NONE, NULL, + "Sets the global value for the amount of gravity"); sv_stopspeed = Cvar_Get ("sv_stopspeed", "100", CVAR_NONE, NULL, "Sets the value that determines how fast the player should come to a complete stop"); - sv_maxspeed = Cvar_Get ("sv_maxspeed", "320", CVAR_NONE, NULL, "Sets the maximum speed a player can move"); + sv_maxspeed = Cvar_Get ("sv_maxspeed", "320", CVAR_NONE, NULL, + "Sets the maximum speed a player can move"); sv_spectatormaxspeed = - Cvar_Get ("sv_spectatormaxspeed", "500", CVAR_NONE, NULL, "Sets the maximum speed a spectator can move"); - sv_accelerate = Cvar_Get ("sv_accelerate", "10", CVAR_NONE, NULL, "Sets the acceleration value for the players"); - sv_airaccelerate = Cvar_Get ("sv_airaccelerate", "0.7", CVAR_NONE, NULL, "Sets how quickly the players accelerate in air"); + Cvar_Get ("sv_spectatormaxspeed", "500", CVAR_NONE, NULL, + "Sets the maximum speed a spectator can move"); + sv_accelerate = Cvar_Get ("sv_accelerate", "10", CVAR_NONE, NULL, + "Sets the acceleration value for the players"); + sv_airaccelerate = Cvar_Get ("sv_airaccelerate", "0.7", CVAR_NONE, NULL, + "Sets how quickly the players accelerate in air"); sv_wateraccelerate = - Cvar_Get ("sv_wateraccelerate", "10", CVAR_NONE, NULL, "Sets the water acceleration value"); - sv_friction = Cvar_Get ("sv_friction", "4", CVAR_NONE, NULL, "Sets the friction value for the players"); - sv_waterfriction = Cvar_Get ("sv_waterfriction", "4", CVAR_NONE, NULL, "Sets the water friction value"); + Cvar_Get ("sv_wateraccelerate", "10", CVAR_NONE, NULL, + "Sets the water acceleration value"); + sv_friction = Cvar_Get ("sv_friction", "4", CVAR_NONE, NULL, + "Sets the friction value for the players"); + sv_waterfriction = Cvar_Get ("sv_waterfriction", "4", CVAR_NONE, NULL, + "Sets the water friction value"); - sv_aim = Cvar_Get ("sv_aim", "2", CVAR_NONE, NULL, "Sets the value for auto-aiming leniency"); + sv_aim = Cvar_Get ("sv_aim", "2", CVAR_NONE, NULL, + "Sets the value for auto-aiming leniency"); sv_timekick = - Cvar_Get ("sv_timekick", "3", CVAR_SERVERINFO, Cvar_Info, "Time cheat protection"); + Cvar_Get ("sv_timekick", "3", CVAR_SERVERINFO, Cvar_Info, + "Time cheat protection"); sv_timekick_fuzz = Cvar_Get ("sv_timekick_fuzz", "15", CVAR_NONE, NULL, "Time cheat \"fuzz factor\""); @@ -1559,7 +1573,8 @@ SV_InitLocal (void) "Minimum QF version on client"); sv_maxrate = - Cvar_Get ("sv_maxrate", "0", CVAR_SERVERINFO, Cvar_Info, "Maximum allowable rate"); + Cvar_Get ("sv_maxrate", "0", CVAR_SERVERINFO, Cvar_Info, + "Maximum allowable rate"); sv_allow_log = Cvar_Get ("sv_allow_log", "1", CVAR_NONE, NULL, "Allow remote logging"); @@ -1585,22 +1600,29 @@ SV_InitLocal (void) "0 Only IP addresses on the Ban list will be allowed onto the server, " "1 Only IP addresses NOT on the Ban list will be allowed onto the server"); - allow_download = Cvar_Get ("allow_download", "1", CVAR_NONE, NULL, "Toggle if clients can download game data from the server"); + allow_download = Cvar_Get ("allow_download", "1", CVAR_NONE, NULL, + "Toggle if clients can download game data from the server"); allow_download_skins = - Cvar_Get ("allow_download_skins", "1", CVAR_NONE, NULL, "Toggle if clients can download skins from the server"); + Cvar_Get ("allow_download_skins", "1", CVAR_NONE, NULL, + "Toggle if clients can download skins from the server"); allow_download_models = - Cvar_Get ("allow_download_models", "1", CVAR_NONE, NULL, "Toggle if clients can download models from the server"); + Cvar_Get ("allow_download_models", "1", CVAR_NONE, NULL, + "Toggle if clients can download models from the server"); allow_download_sounds = - Cvar_Get ("allow_download_sounds", "1", CVAR_NONE, NULL, "Toggle if clients can download sounds from the server"); + Cvar_Get ("allow_download_sounds", "1", CVAR_NONE, NULL, + "Toggle if clients can download sounds from the server"); allow_download_maps = - Cvar_Get ("allow_download_maps", "1", CVAR_NONE, NULL, "Toggle if clients can download maps from the server"); + Cvar_Get ("allow_download_maps", "1", CVAR_NONE, NULL, + "Toggle if clients can download maps from the server"); - sv_highchars = Cvar_Get ("sv_highchars", "1", CVAR_NONE, NULL, "Toggle the use of high character color names for players"); + sv_highchars = Cvar_Get ("sv_highchars", "1", CVAR_NONE, NULL, + "Toggle the use of high character color names for players"); sv_phs = Cvar_Get ("sv_phs", "1", CVAR_NONE, NULL, "Possibly Hearable Set. If set to zero, the server calculates sound hearability in realtime"); - pausable = Cvar_Get ("pausable", "1", CVAR_NONE, NULL, "Toggle if server can be paused 1 is on, 0 is off"); + pausable = Cvar_Get ("pausable", "1", CVAR_NONE, NULL, + "Toggle if server can be paused 1 is on, 0 is off"); // DoS protection Cmd_AddCommand ("netdosexpire", SV_netDoSexpire_f, "FIXME: part of DoS protection obviously, but I don't know what it does. No Description"); diff --git a/qw/source/vid_3dfxsvga.c b/qw/source/vid_3dfxsvga.c index d57e7564a..1168e94f0 100644 --- a/qw/source/vid_3dfxsvga.c +++ b/qw/source/vid_3dfxsvga.c @@ -4,7 +4,6 @@ OpenGL device driver for 3Dfx chipsets running Linux Copyright (C) 1996-1997 Id Software, Inc. - Copyright (C) 1999,2000 Nelson Rush. Copyright (C) 1999,2000 contributors of the QuakeForge project Please see the file "AUTHORS" for a list of contributors