From 16e3d9f955fd7feb25b9c2cb1a3884123bdb8c76 Mon Sep 17 00:00:00 2001
From: Christopher Schwarz <lakitu7@gmail.com>
Date: Tue, 6 Oct 2009 07:18:14 +0000
Subject: * Remove many unused cvars that don't do anything * Remove
g_adminNameProtect, force it on * Remove g_chatTeamPrefix, force it on
---
src/cgame/cg_local.h | 3 ---
src/cgame/cg_main.c | 9 ---------
src/client/cl_main.c | 4 ----
src/game/g_admin.c | 3 ---
src/game/g_cmds.c | 11 +++--------
src/game/g_local.h | 6 ------
src/game/g_main.c | 22 +---------------------
src/ui/ui_main.c | 4 ----
8 files changed, 4 insertions(+), 58 deletions(-)
(limited to 'src')
diff --git a/src/cgame/cg_local.h b/src/cgame/cg_local.h
index 6b87f7c2..17328819 100644
--- a/src/cgame/cg_local.h
+++ b/src/cgame/cg_local.h
@@ -1463,7 +1463,6 @@ extern vmCvar_t cg_noPlayerAnims;
extern vmCvar_t cg_showmiss;
extern vmCvar_t cg_footsteps;
extern vmCvar_t cg_addMarks;
-extern vmCvar_t cg_brassTime;
extern vmCvar_t cg_viewsize;
extern vmCvar_t cg_drawGun;
extern vmCvar_t cg_gun_frame;
@@ -1473,7 +1472,6 @@ extern vmCvar_t cg_gun_z;
extern vmCvar_t cg_tracerChance;
extern vmCvar_t cg_tracerWidth;
extern vmCvar_t cg_tracerLength;
-extern vmCvar_t cg_autoswitch;
extern vmCvar_t cg_thirdPerson;
extern vmCvar_t cg_thirdPersonAngle;
extern vmCvar_t cg_thirdPersonShoulderViewMode;
@@ -1485,7 +1483,6 @@ extern vmCvar_t cg_synchronousClients;
extern vmCvar_t cg_stats;
extern vmCvar_t cg_paused;
extern vmCvar_t cg_blood;
-extern vmCvar_t cg_drawFriend;
extern vmCvar_t cg_teamChatsOnly;
extern vmCvar_t cg_noVoiceChats;
extern vmCvar_t cg_noVoiceText;
diff --git a/src/cgame/cg_main.c b/src/cgame/cg_main.c
index 3d58d714..a440bf7f 100644
--- a/src/cgame/cg_main.c
+++ b/src/cgame/cg_main.c
@@ -129,7 +129,6 @@ vmCvar_t cg_noPlayerAnims;
vmCvar_t cg_showmiss;
vmCvar_t cg_footsteps;
vmCvar_t cg_addMarks;
-vmCvar_t cg_brassTime;
vmCvar_t cg_viewsize;
vmCvar_t cg_drawGun;
vmCvar_t cg_gun_frame;
@@ -139,7 +138,6 @@ vmCvar_t cg_gun_z;
vmCvar_t cg_tracerChance;
vmCvar_t cg_tracerWidth;
vmCvar_t cg_tracerLength;
-vmCvar_t cg_autoswitch;
vmCvar_t cg_thirdPerson;
vmCvar_t cg_thirdPersonAngle;
vmCvar_t cg_thirdPersonShoulderViewMode;
@@ -151,7 +149,6 @@ vmCvar_t cg_synchronousClients;
vmCvar_t cg_stats;
vmCvar_t cg_paused;
vmCvar_t cg_blood;
-vmCvar_t cg_drawFriend;
vmCvar_t cg_teamChatsOnly;
vmCvar_t cg_noPrintDuplicate;
vmCvar_t cg_noVoiceChats;
@@ -224,7 +221,6 @@ typedef struct
static cvarTable_t cvarTable[ ] =
{
- { &cg_autoswitch, "cg_autoswitch", "1", CVAR_ARCHIVE },
{ &cg_drawGun, "cg_drawGun", "1", CVAR_ARCHIVE },
{ &cg_viewsize, "cg_viewsize", "100", CVAR_ARCHIVE },
{ &cg_stereoSeparation, "cg_stereoSeparation", "0.4", CVAR_ARCHIVE },
@@ -239,7 +235,6 @@ static cvarTable_t cvarTable[ ] =
{ &cg_drawCrosshair, "cg_drawCrosshair", "1", CVAR_ARCHIVE },
{ &cg_drawCrosshairNames, "cg_drawCrosshairNames", "1", CVAR_ARCHIVE },
{ &cg_crosshairSize, "cg_crosshairSize", "1", CVAR_ARCHIVE },
- { &cg_brassTime, "cg_brassTime", "2500", CVAR_ARCHIVE },
{ &cg_addMarks, "cg_marks", "1", CVAR_ARCHIVE },
{ &cg_lagometer, "cg_lagometer", "0", CVAR_ARCHIVE },
{ &cg_teslaTrailTime, "cg_teslaTrailTime", "250", CVAR_ARCHIVE },
@@ -269,7 +264,6 @@ static cvarTable_t cvarTable[ ] =
{ &cg_thirdPersonPitchFollow, "cg_thirdPersonPitchFollow", "0", 0 },
{ &cg_thirdPersonShoulderViewMode, "cg_thirdPersonShoulderViewMode", "1", CVAR_ARCHIVE },
{ &cg_stats, "cg_stats", "0", 0 },
- { &cg_drawFriend, "cg_drawFriend", "1", CVAR_ARCHIVE },
{ &cg_teamChatsOnly, "cg_teamChatsOnly", "0", CVAR_ARCHIVE },
{ &cg_noPrintDuplicate, "cg_noPrintDuplicate", "0", CVAR_ARCHIVE },
{ &cg_noVoiceChats, "cg_noVoiceChats", "0", CVAR_ARCHIVE },
@@ -365,9 +359,6 @@ void CG_RegisterCvars( void )
cv->defaultString, cv->cvarFlags );
}
- //repress standard Q3 console
- trap_Cvar_Set( "con_notifytime", "-2" );
-
// see if we are also running the server on this machine
trap_Cvar_VariableStringBuffer( "sv_running", var, sizeof( var ) );
cgs.localServer = atoi( var );
diff --git a/src/client/cl_main.c b/src/client/cl_main.c
index 16fbe56b..a891e5a3 100644
--- a/src/client/cl_main.c
+++ b/src/client/cl_main.c
@@ -3333,10 +3333,6 @@ void CL_Init( void ) {
cl_serverStatusResendTime = Cvar_Get ("cl_serverStatusResendTime", "750", 0);
- // init autoswitch so the ui will have it correctly even
- // if the cgame hasn't been started
- Cvar_Get ("cg_autoswitch", "1", CVAR_ARCHIVE);
-
m_pitch = Cvar_Get ("m_pitch", "0.022", CVAR_ARCHIVE);
m_yaw = Cvar_Get ("m_yaw", "0.022", CVAR_ARCHIVE);
m_forward = Cvar_Get ("m_forward", "0.25", CVAR_ARCHIVE);
diff --git a/src/game/g_admin.c b/src/game/g_admin.c
index bcd2b8e7..0452558a 100644
--- a/src/game/g_admin.c
+++ b/src/game/g_admin.c
@@ -287,9 +287,6 @@ qboolean G_admin_name_check( gentity_t *ent, char *name, char *err, int len )
}
}
- if( !g_adminNameProtect.integer )
- return qtrue;
-
for( i = 0; i < MAX_ADMIN_ADMINS && g_admin_admins[ i ]; i++ )
{
if( g_admin_admins[ i ]->level < 1 )
diff --git a/src/game/g_cmds.c b/src/game/g_cmds.c
index 4cbfa35b..afa7b5eb 100644
--- a/src/game/g_cmds.c
+++ b/src/game/g_cmds.c
@@ -713,7 +713,7 @@ void G_Say( gentity_t *ent, gentity_t *target, int mode, const char *chatText )
char text[ MAX_SAY_TEXT ];
char location[ 64 ];
- if( ent && g_chatTeamPrefix.integer )
+ if( ent )
{
prefix = BG_TeamName( ent->client->pers.teamSelection );
prefix = va( "[%c] ", toupper( *prefix ) );
@@ -794,13 +794,8 @@ static void Cmd_SayArea_f( gentity_t *ent )
for(i = 0; i < 3; i++ )
range[ i ] = g_sayAreaRange.value;
- if( g_chatTeamPrefix.integer )
- {
- prefix = BG_TeamName( ent->client->pers.teamSelection );
- prefix = va( "[%c] ", toupper( *prefix ) );
- }
- else
- prefix = "";
+ prefix = BG_TeamName( ent->client->pers.teamSelection );
+ prefix = va( "[%c] ", toupper( *prefix ) );
G_LogPrintf( "sayarea: %s%s^7: %s\n", prefix, ent->client->pers.netname, msg );
Com_sprintf( name, sizeof( name ), "%s<%s%c%c> ",
diff --git a/src/game/g_local.h b/src/game/g_local.h
index 59d76f12..9d6feb5f 100644
--- a/src/game/g_local.h
+++ b/src/game/g_local.h
@@ -1067,12 +1067,9 @@ extern vmCvar_t g_needpass;
extern vmCvar_t g_gravity;
extern vmCvar_t g_speed;
extern vmCvar_t g_knockback;
-extern vmCvar_t g_quadfactor;
extern vmCvar_t g_inactivity;
extern vmCvar_t g_debugMove;
extern vmCvar_t g_debugDamage;
-extern vmCvar_t g_weaponRespawn;
-extern vmCvar_t g_weaponTeamRespawn;
extern vmCvar_t g_synchronousClients;
extern vmCvar_t g_motd;
extern vmCvar_t g_warmup;
@@ -1082,12 +1079,10 @@ extern vmCvar_t g_allowVote;
extern vmCvar_t g_voteLimit;
extern vmCvar_t g_suddenDeathVotePercent;
extern vmCvar_t g_suddenDeathVoteDelay;
-extern vmCvar_t g_teamAutoJoin;
extern vmCvar_t g_teamForceBalance;
extern vmCvar_t g_smoothClients;
extern vmCvar_t pmove_fixed;
extern vmCvar_t pmove_msec;
-extern vmCvar_t g_rankings;
extern vmCvar_t g_enableDust;
extern vmCvar_t g_enableBreath;
extern vmCvar_t g_singlePlayer;
@@ -1146,7 +1141,6 @@ extern vmCvar_t g_emoticonsAllowedInNames;
extern vmCvar_t g_admin;
extern vmCvar_t g_adminLog;
extern vmCvar_t g_adminParseSay;
-extern vmCvar_t g_adminNameProtect;
extern vmCvar_t g_adminTempBan;
extern vmCvar_t g_adminMaxBan;
diff --git a/src/game/g_main.c b/src/game/g_main.c
index b6b8a2db..e2f9eaaa 100644
--- a/src/game/g_main.c
+++ b/src/game/g_main.c
@@ -57,12 +57,9 @@ vmCvar_t g_speed;
vmCvar_t g_gravity;
vmCvar_t g_cheats;
vmCvar_t g_knockback;
-vmCvar_t g_quadfactor;
vmCvar_t g_inactivity;
vmCvar_t g_debugMove;
vmCvar_t g_debugDamage;
-vmCvar_t g_weaponRespawn;
-vmCvar_t g_weaponTeamRespawn;
vmCvar_t g_motd;
vmCvar_t g_synchronousClients;
vmCvar_t g_warmup;
@@ -71,18 +68,14 @@ vmCvar_t g_restarted;
vmCvar_t g_logFile;
vmCvar_t g_logFileSync;
vmCvar_t g_blood;
-vmCvar_t g_podiumDist;
-vmCvar_t g_podiumDrop;
vmCvar_t g_allowVote;
vmCvar_t g_voteLimit;
vmCvar_t g_suddenDeathVotePercent;
vmCvar_t g_suddenDeathVoteDelay;
-vmCvar_t g_teamAutoJoin;
vmCvar_t g_teamForceBalance;
vmCvar_t g_smoothClients;
vmCvar_t pmove_fixed;
vmCvar_t pmove_msec;
-vmCvar_t g_rankings;
vmCvar_t g_minCommandPeriod;
vmCvar_t g_minNameChangePeriod;
vmCvar_t g_maxNameChanges;
@@ -127,7 +120,6 @@ vmCvar_t g_voiceChats;
vmCvar_t g_shove;
vmCvar_t g_mapConfigs;
-vmCvar_t g_chatTeamPrefix;
vmCvar_t g_sayAreaRange;
vmCvar_t g_floodMaxDemerits;
@@ -141,7 +133,6 @@ vmCvar_t g_emoticonsAllowedInNames;
vmCvar_t g_admin;
vmCvar_t g_adminLog;
vmCvar_t g_adminParseSay;
-vmCvar_t g_adminNameProtect;
vmCvar_t g_adminTempBan;
vmCvar_t g_adminMaxBan;
@@ -185,7 +176,6 @@ static cvarTable_t gameCvarTable[ ] =
{ &g_friendlyBuildableFire, "g_friendlyBuildableFire", "0", CVAR_ARCHIVE, 0, qtrue },
{ &g_dretchPunt, "g_dretchPunt", "0", CVAR_ARCHIVE, 0, qtrue },
- { &g_teamAutoJoin, "g_teamAutoJoin", "0", CVAR_ARCHIVE },
{ &g_teamForceBalance, "g_teamForceBalance", "0", CVAR_ARCHIVE },
{ &g_warmup, "g_warmup", "20", CVAR_ARCHIVE, 0, qtrue },
@@ -202,18 +192,12 @@ static cvarTable_t gameCvarTable[ ] =
{ &g_speed, "g_speed", "320", 0, 0, qtrue },
{ &g_gravity, "g_gravity", "800", 0, 0, qtrue },
{ &g_knockback, "g_knockback", "1000", 0, 0, qtrue },
- { &g_quadfactor, "g_quadfactor", "3", 0, 0, qtrue },
- { &g_weaponRespawn, "g_weaponrespawn", "5", 0, 0, qtrue },
- { &g_weaponTeamRespawn, "g_weaponTeamRespawn", "30", 0, 0, qtrue },
{ &g_inactivity, "g_inactivity", "0", 0, 0, qtrue },
{ &g_debugMove, "g_debugMove", "0", 0, 0, qfalse },
{ &g_debugDamage, "g_debugDamage", "0", 0, 0, qfalse },
{ &g_motd, "g_motd", "", 0, 0, qfalse },
{ &g_blood, "com_blood", "1", 0, 0, qfalse },
- { &g_podiumDist, "g_podiumDist", "80", 0, 0, qfalse },
- { &g_podiumDrop, "g_podiumDrop", "70", 0, 0, qfalse },
-
{ &g_allowVote, "g_allowVote", "1", CVAR_ARCHIVE, 0, qfalse },
{ &g_voteLimit, "g_voteLimit", "5", CVAR_ARCHIVE, 0, qfalse },
{ &g_suddenDeathVotePercent, "g_suddenDeathVotePercent", "74", CVAR_ARCHIVE, 0, qfalse },
@@ -251,7 +235,6 @@ static cvarTable_t gameCvarTable[ ] =
{ &g_disabledClasses, "g_disabledClasses", "", CVAR_ROM, 0, qfalse },
{ &g_disabledBuildables, "g_disabledBuildables", "", CVAR_ROM, 0, qfalse },
- { &g_chatTeamPrefix, "g_chatTeamPrefix", "0", CVAR_ARCHIVE, 0, qfalse },
{ &g_sayAreaRange, "g_sayAreaRange", "1000", CVAR_ARCHIVE, 0, qtrue },
{ &g_floodMaxDemerits, "g_floodMaxDemerits", "5000", CVAR_ARCHIVE, 0, qfalse },
@@ -279,7 +262,6 @@ static cvarTable_t gameCvarTable[ ] =
{ &g_admin, "g_admin", "admin.dat", CVAR_ARCHIVE, 0, qfalse },
{ &g_adminLog, "g_adminLog", "admin.log", CVAR_ARCHIVE, 0, qfalse },
{ &g_adminParseSay, "g_adminParseSay", "1", CVAR_ARCHIVE, 0, qfalse },
- { &g_adminNameProtect, "g_adminNameProtect", "1", CVAR_ARCHIVE, 0, qfalse },
{ &g_adminTempBan, "g_adminTempBan", "2m", CVAR_ARCHIVE, 0, qfalse },
{ &g_adminMaxBan, "g_adminMaxBan", "2w", CVAR_ARCHIVE, 0, qfalse },
@@ -289,9 +271,7 @@ static cvarTable_t gameCvarTable[ ] =
{ &g_specChat, "g_specChat", "1", CVAR_ARCHIVE, 0, qfalse },
{ &g_publicAdminMessages, "g_publicAdminMessages", "1", CVAR_ARCHIVE, 0, qfalse },
- { &g_tag, "g_tag", "main", CVAR_INIT, 0, qfalse },
-
- { &g_rankings, "g_rankings", "0", 0, 0, qfalse}
+ { &g_tag, "g_tag", "main", CVAR_INIT, 0, qfalse }
};
static int gameCvarTableSize = sizeof( gameCvarTable ) / sizeof( gameCvarTable[ 0 ] );
diff --git a/src/ui/ui_main.c b/src/ui/ui_main.c
index c63dae79..f148b8c1 100644
--- a/src/ui/ui_main.c
+++ b/src/ui/ui_main.c
@@ -2756,7 +2756,6 @@ static void UI_Update( const char *name )
trap_Cvar_SetValue( "r_fastSky", 0 );
trap_Cvar_SetValue( "r_inGameVideo", 1 );
trap_Cvar_SetValue( "cg_shadows", 1 );
- trap_Cvar_SetValue( "cg_brassTime", 2500 );
trap_Cvar_SetValue( "cg_bounceParticles", 1 );
trap_Cvar_Set( "r_texturemode", "GL_LINEAR_MIPMAP_LINEAR" );
break;
@@ -2771,7 +2770,6 @@ static void UI_Update( const char *name )
trap_Cvar_SetValue( "r_texturebits", 0 );
trap_Cvar_SetValue( "r_fastSky", 0 );
trap_Cvar_SetValue( "r_inGameVideo", 1 );
- trap_Cvar_SetValue( "cg_brassTime", 2500 );
trap_Cvar_Set( "r_texturemode", "GL_LINEAR_MIPMAP_LINEAR" );
trap_Cvar_SetValue( "cg_shadows", 0 );
trap_Cvar_SetValue( "cg_bounceParticles", 0 );
@@ -2788,7 +2786,6 @@ static void UI_Update( const char *name )
trap_Cvar_SetValue( "cg_shadows", 0 );
trap_Cvar_SetValue( "r_fastSky", 1 );
trap_Cvar_SetValue( "r_inGameVideo", 0 );
- trap_Cvar_SetValue( "cg_brassTime", 0 );
trap_Cvar_SetValue( "cg_bounceParticles", 0 );
trap_Cvar_Set( "r_texturemode", "GL_LINEAR_MIPMAP_NEAREST" );
break;
@@ -2802,7 +2799,6 @@ static void UI_Update( const char *name )
trap_Cvar_SetValue( "r_picmip", 2 );
trap_Cvar_SetValue( "r_texturebits", 16 );
trap_Cvar_SetValue( "cg_shadows", 0 );
- trap_Cvar_SetValue( "cg_brassTime", 0 );
trap_Cvar_SetValue( "r_fastSky", 1 );
trap_Cvar_SetValue( "r_inGameVideo", 0 );
trap_Cvar_SetValue( "cg_bounceParticles", 0 );
--
cgit