From 7836b3a1679c975b4906a92a6e31e306b2810fe6 Mon Sep 17 00:00:00 2001
From: div0 <div0@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Date: Thu, 15 Nov 2007 18:43:45 +0000
Subject: [PATCH] made cvars like g_ctf only be queried once on startup

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@2958 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
---
 data/qcsrc/server/bots.qc           |  2 +-
 data/qcsrc/server/cl_client.qc      | 38 ++++++++++++++---------------
 data/qcsrc/server/cl_impulse.qc     |  2 +-
 data/qcsrc/server/cl_player.qc      |  4 +--
 data/qcsrc/server/clientcommands.qc |  4 +--
 data/qcsrc/server/ctf.qc            |  6 ++---
 data/qcsrc/server/defs.qh           |  2 ++
 data/qcsrc/server/g_damage.qc       |  8 +++---
 data/qcsrc/server/g_world.qc        |  8 +++---
 data/qcsrc/server/havocbot_roles.qc |  4 +--
 data/qcsrc/server/miscfunctions.qc  | 20 +++++++--------
 data/qcsrc/server/mode_onslaught.qc |  6 ++---
 data/qcsrc/server/t_items.qc        |  8 +++---
 data/qcsrc/server/teamplay.qc       | 38 +++++++----------------------
 14 files changed, 66 insertions(+), 84 deletions(-)

diff --git a/data/qcsrc/server/bots.qc b/data/qcsrc/server/bots.qc
index b70cdec08..707ec3057 100644
--- a/data/qcsrc/server/bots.qc
+++ b/data/qcsrc/server/bots.qc
@@ -2149,7 +2149,7 @@ void() bot_serverframe =
 
 	FOR_EACH_REALCLIENT(head)
 	{
-		if(head.classname == "player" || cvar("g_lms") || cvar("g_arena"))
+		if(head.classname == "player" || g_lms || g_arena)
 			++activerealplayers;
 		++realplayers;
 	}
diff --git a/data/qcsrc/server/cl_client.qc b/data/qcsrc/server/cl_client.qc
index 83e3e7e42..fbb8f006a 100644
--- a/data/qcsrc/server/cl_client.qc
+++ b/data/qcsrc/server/cl_client.qc
@@ -141,7 +141,7 @@ entity SelectSpawnPoint (float anypoint)
 
 	teamcheck = 0;
 
-	if(!anypoint && (cvar("g_ctf") || cvar("g_assault")))
+	if(!anypoint && (g_ctf || g_assault))
 		teamcheck = self.team;
 
 	// get the list of players
@@ -313,7 +313,7 @@ void PutObserverInServer (void)
 
 	DistributeFragsAmongTeam(self, self.team, 1);
 
-	if(self.frags <= 0 && self.frags > -666 && cvar("g_lms") && self.killcount != -666)
+	if(self.frags <= 0 && self.frags > -666 && g_lms && self.killcount != -666)
 		bprint ("^4", self.netname, "^4 has no more lives left\n");
 	else if(self.killcount != -666)
 		bprint ("^4", self.netname, "^4 is spectating now\n");
@@ -372,7 +372,7 @@ void PutObserverInServer (void)
 	self.oldvelocity = self.velocity;
 	self.customizeentityforclient = Client_customizeentityforclient;
 
-	if(cvar("g_arena"))
+	if(g_arena)
 	{
 		if(self.frags != -2)
 		{
@@ -384,7 +384,7 @@ void PutObserverInServer (void)
 			Spawnqueue_Remove(self);
 		}
 	}
-	else if(!cvar("g_lms"))
+	else if(!g_lms)
 		self.frags = -666;
 }
 
@@ -410,10 +410,10 @@ void PutClientInServer (void)
 	}
 
 	// player is dead and becomes observer
-	if(cvar("g_lms") && self.frags < 1)
+	if(g_lms && self.frags < 1)
 		self.classname = "observer";
 
-	if(cvar("g_arena"))
+	if(g_arena)
 	if(!self.spawned)
 		self.classname = "observer";
 
@@ -522,7 +522,7 @@ void PutClientInServer (void)
 		// don't reset back to last position, even if new position is stuck in solid
 		self.oldorigin = self.origin;
 
-		if(cvar("g_arena"))
+		if(g_arena)
 		{
 			Spawnqueue_Remove(self);
 			Spawnqueue_Mark(self);
@@ -537,8 +537,8 @@ void PutClientInServer (void)
 
 		if(self.killcount == -666) {
 			self.killcount = 0;
-			if(!cvar("g_arena"))
-			if(!cvar("g_lms"))
+			if(!g_arena)
+			if(!g_lms)
 				self.frags = 0;
 		}
 
@@ -564,7 +564,7 @@ void PutClientInServer (void)
 		if (cvar("g_spawnsound"))
 			sound (self, CHAN_AUTO, "misc/spawn.wav", 1, ATTN_NORM);
 
-		if(cvar("g_assault")) {
+		if(g_assault) {
 			if(self.team == assault_attacker_team)
 				centerprint(self, "You are attacking!\n");
 			else
@@ -677,7 +677,7 @@ void ClientConnect (void)
 
 	//JoinBestTeam(self, FALSE);
 
-	if((cvar("sv_spectate") == 1 && !cvar("g_lms")) || cvar("g_campaign")) {
+	if((cvar("sv_spectate") == 1 && !g_lms) || cvar("g_campaign")) {
 		self.classname = "observer";
 	} else {
 		self.classname = "player";
@@ -702,7 +702,7 @@ void ClientConnect (void)
 	bprint ("^4",self.netname);
 	bprint ("^4 connected");
 
-	if(cvar("g_domination") || cvar("g_ctf"))
+	if(cvar("g_domination") || g_ctf)
 	{
 		bprint(" and joined the ");
 		bprint(ColoredTeamName(self.team));
@@ -753,7 +753,7 @@ void ClientConnect (void)
 	else
 		stuffcmd(self, "set teamplay 0\n");
 
-	if(cvar("g_lms"))
+	if(g_lms)
 	{
 		self.frags = cvar("fraglimit");
 		// no fraglimit was set, so player gets 999 lives
@@ -766,7 +766,7 @@ void ClientConnect (void)
 			self.frags = -666;
 		}
 	}
-	else if(cvar("g_arena"))
+	else if(g_arena)
 	{
 		self.classname = "observer";
 		Spawnqueue_Insert(self);
@@ -827,7 +827,7 @@ void ClientDisconnect (void)
 		if(self.weaponentity.lasertarget)
 			remove(self.weaponentity.lasertarget);
 
-	if(cvar("g_arena"))
+	if(g_arena)
 	{
 		Spawnqueue_Unmark(self);
 		Spawnqueue_Remove(self);
@@ -1057,7 +1057,7 @@ void player_regen (void)
 	limith = cvar("g_balance_health_limit");
 	limita = cvar("g_balance_armor_limit");
 
-	if (cvar("g_minstagib") || (cvar("g_lms") && !cvar("g_lms_regenerate")))
+	if (cvar("g_minstagib") || (g_lms && !cvar("g_lms_regenerate")))
 		return;
 
 	max_mod = regen_mod = rot_mod = limit_mod = 1;
@@ -1294,7 +1294,7 @@ void PlayerPreThink (void)
 		if(self.button7)
 			PrintWelcomeMessage(self);
 
-		if(cvar("g_lms") || !cvar("sv_spectate"))
+		if(g_lms || !cvar("sv_spectate"))
 		if((time - self.jointime) <= cvar("welcome_message_time"))
 			PrintWelcomeMessage(self);
 
@@ -1321,7 +1321,7 @@ void PlayerPreThink (void)
 			float button_pressed, force_respawn;
 			player_anim();
 			button_pressed = (self.button0 || self.button2 || self.button3 || self.button6 || self.buttonuse);
-			force_respawn = (cvar("g_lms") || cvar("g_forced_respawn"));
+			force_respawn = (g_lms || cvar("g_forced_respawn"));
 			if (self.deadflag == DEAD_DYING)
 			{
 				if(force_respawn)
@@ -1348,7 +1348,7 @@ void PlayerPreThink (void)
 			return;
 		}
 
-		if(cvar("g_lms") && !self.deadflag && cvar("g_lms_campcheck_interval"))
+		if(g_lms && !self.deadflag && cvar("g_lms_campcheck_interval"))
 		{
 			vector dist;
 
diff --git a/data/qcsrc/server/cl_impulse.qc b/data/qcsrc/server/cl_impulse.qc
index 574c15910..49d4df340 100644
--- a/data/qcsrc/server/cl_impulse.qc
+++ b/data/qcsrc/server/cl_impulse.qc
@@ -86,7 +86,7 @@ void ImpulseCommands (void)
 		{
 			if (self.weapon != WEP_LASER
 				&& !cvar("g_minstagib") && !cvar("g_instagib")
-				&& !cvar("g_rocketarena") && !cvar("g_lms") && cvar("g_pickup_items") && !cvar("g_nixnex"))
+				&& !cvar("g_rocketarena") && !g_lms && cvar("g_pickup_items") && !cvar("g_nixnex"))
 				W_ThrowWeapon(W_CalculateProjectileVelocity(self.velocity, v_forward * 750), '0 0 0', TRUE);
 		}
 	}
diff --git a/data/qcsrc/server/cl_player.qc b/data/qcsrc/server/cl_player.qc
index 66d2375b4..cbdff48c7 100644
--- a/data/qcsrc/server/cl_player.qc
+++ b/data/qcsrc/server/cl_player.qc
@@ -236,7 +236,7 @@ void PlayerDamage (entity inflictor, entity attacker, float damage, float deatht
 		self.v_angle_y = self.v_angle_y + (random() * 2 - 1) * shake;
 	}
 
-	if(cvar("g_arena"))
+	if(g_arena)
 	if(numspawned < 2)
 		return;
 
@@ -396,7 +396,7 @@ void PlayerDamage (entity inflictor, entity attacker, float damage, float deatht
 			//WriteAngle (MSG_ONE, 80);
 		}
 
-		if(cvar("g_arena"))
+		if(g_arena)
 			Spawnqueue_Unmark(self);
 	}
 }
diff --git a/data/qcsrc/server/clientcommands.qc b/data/qcsrc/server/clientcommands.qc
index e773bdf5d..6ca0d62c2 100644
--- a/data/qcsrc/server/clientcommands.qc
+++ b/data/qcsrc/server/clientcommands.qc
@@ -375,7 +375,7 @@ void SV_ParseClientCommand(string s) {
 	} else if(argv(0) == "sentcvar") { // new system
 		GetCvars(1);
 	} else if(argv(0) == "spectate") {
-		if(cvar("g_lms") || cvar("g_arena"))
+		if(g_lms || g_arena)
 			return; // don't allow spectating in lms, unless player runs out of lives
 		if(self.classname == "player" && cvar("sv_spectate") == 1) {
 			if(self.flagcarried)
@@ -387,7 +387,7 @@ void SV_ParseClientCommand(string s) {
 			PutClientInServer();
 		}
 	} else if(argv(0) == "join") {
-		if(!cvar("g_arena"))
+		if(!g_arena)
 		if (self.classname != "player")
 		{
 			self.classname = "player";
diff --git a/data/qcsrc/server/ctf.qc b/data/qcsrc/server/ctf.qc
index e71510bbe..88cac43c5 100644
--- a/data/qcsrc/server/ctf.qc
+++ b/data/qcsrc/server/ctf.qc
@@ -395,7 +395,7 @@ Keys:
 
 void() item_flag_team1 =
 {
-	if (!cvar("g_ctf"))
+	if (!g_ctf)
 		return;
 	//if(!cvar("teamplay"))
 	//	cvar_set("teamplay", "3");
@@ -451,7 +451,7 @@ Keys:
 
 void() item_flag_team2 =
 {
-	if (!cvar("g_ctf"))
+	if (!g_ctf)
 		return;
 	//if(!cvar("teamplay"))
 	//	cvar_set("teamplay", "3");
@@ -597,7 +597,7 @@ void() ctf_setstatus =
 	self.items = self.items - (self.items & IT_BLUE_FLAG_TAKEN);
 	self.items = self.items - (self.items & IT_BLUE_FLAG_LOST);
 
-	if (cvar("g_ctf")) {
+	if (g_ctf) {
 		local entity flag;
 		flag = find(world, classname, "item_flag_team1");
 		ctf_setstatus2(flag);
diff --git a/data/qcsrc/server/defs.qh b/data/qcsrc/server/defs.qh
index 059d20795..2fc55b321 100644
--- a/data/qcsrc/server/defs.qh
+++ b/data/qcsrc/server/defs.qh
@@ -1,5 +1,7 @@
 // Globals
 
+float g_domination, g_ctf, g_tdm, g_keyhunt, g_onslaught, g_assault, g_arena, g_lms;
+
 float sv_cheats;
 
 entity	activator;
diff --git a/data/qcsrc/server/g_damage.qc b/data/qcsrc/server/g_damage.qc
index a60bac7a4..cc99d677a 100644
--- a/data/qcsrc/server/g_damage.qc
+++ b/data/qcsrc/server/g_damage.qc
@@ -11,7 +11,7 @@ void GiveFrags (entity attacker, entity targ, float f)
 {
 	if(gameover) return;
 
-	if(cvar("g_arena"))
+	if(g_arena)
 		if(cvar("g_arena_roundbased"))
 			return;
 
@@ -26,11 +26,11 @@ void GiveFrags (entity attacker, entity targ, float f)
 		if(f > 0)
 			f = RunematchHandleFrags(attacker, targ, f);
 	}
-	else if(cvar("g_keyhunt"))
+	else if(g_keyhunt)
 	{
 		f = kh_HandleFrags(attacker, targ, f);
 	}
-	else if(cvar("g_lms"))
+	else if(g_lms)
 	{
 		// count remaining lives, not frags in lms
 		targ.frags -= 1;
@@ -384,7 +384,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float
 			}
 		}
 
-		if(cvar("g_lms"))
+		if(g_lms)
 		if(targ.classname == "player")
 		if(attacker.classname == "player")
 		if(attacker != targ)
diff --git a/data/qcsrc/server/g_world.qc b/data/qcsrc/server/g_world.qc
index 7677d9bc0..266401615 100644
--- a/data/qcsrc/server/g_world.qc
+++ b/data/qcsrc/server/g_world.qc
@@ -1649,15 +1649,15 @@ void() CheckRules_World =
 	}
 
 	status = WINNING_NO;
-	if(cvar("g_assault"))
+	if(g_assault)
 	{
 		status = WinningCondition_Assault();
 	}
-	else if(cvar("g_lms"))
+	else if(g_lms)
 	{
 		status = WinningCondition_LMS();
 	}
-	else if (cvar("g_onslaught"))
+	else if (g_onslaught)
 	{
 		status = WinningCondition_Onslaught();
 	}
@@ -1665,7 +1665,7 @@ void() CheckRules_World =
 	{
 		if(teams_matter)
 		{
-			if(cvar("g_tdm") || cvar("g_runematch") || cvar("g_ctf") || cvar("g_domination") || cvar("g_keyhunt"))
+			if(g_tdm || cvar("g_runematch") || g_ctf || cvar("g_domination") || g_keyhunt)
 				status = WinningCondition_MaxTeamSum(fraglimit);
 			//else if()
 			//	status = WinningCondition_MaxTeamMax(fraglimit);
diff --git a/data/qcsrc/server/havocbot_roles.qc b/data/qcsrc/server/havocbot_roles.qc
index 1dc2af9d8..794c6b5a2 100644
--- a/data/qcsrc/server/havocbot_roles.qc
+++ b/data/qcsrc/server/havocbot_roles.qc
@@ -709,11 +709,11 @@ void() havocbot_chooserole =
 	dprint("choose a role...\n");
 	navigation_routetogoal(world);
 	self.bot_strategytime = -1;
-	if (cvar("g_ctf"))
+	if (g_ctf)
 		havocbot_chooserole_ctf();
 	else if (cvar("g_domination"))
 		havocbot_chooserole_dom();
-	else if (cvar("g_keyhunt"))
+	else if (g_keyhunt)
 		havocbot_chooserole_kh();
 	else // assume anything else is deathmatch
 		havocbot_chooserole_dm();
diff --git a/data/qcsrc/server/miscfunctions.qc b/data/qcsrc/server/miscfunctions.qc
index 815b36797..e7ad4a315 100644
--- a/data/qcsrc/server/miscfunctions.qc
+++ b/data/qcsrc/server/miscfunctions.qc
@@ -746,7 +746,7 @@ void readlevelcvars(void)
 	}
 	else
 	{
-		if(cvar("g_lms"))
+		if(g_lms)
 		{
 			start_ammo_shells = cvar("g_lms_start_ammo_shells");
 			start_ammo_nails = cvar("g_lms_start_ammo_nails");
@@ -767,55 +767,55 @@ void readlevelcvars(void)
 			start_ammo_cells = cvar("g_pickup_cells_max");
 		}
 
-		if (cvar("g_start_weapon_laser") || cvar("g_lms"))
+		if (cvar("g_start_weapon_laser") || g_lms)
 		{
 			start_items = start_items | IT_LASER;
 			start_switchweapon = WEP_LASER;
 			weapon_action(start_switchweapon, WR_PRECACHE);
 		}
-		if (cvar("g_start_weapon_shotgun") || cvar("g_lms"))
+		if (cvar("g_start_weapon_shotgun") || g_lms)
 		{
 			start_items = start_items | IT_SHOTGUN;
 			start_switchweapon = WEP_SHOTGUN;
 			weapon_action(start_switchweapon, WR_PRECACHE);
 		}
-		if (cvar("g_start_weapon_uzi") || cvar("g_lms"))
+		if (cvar("g_start_weapon_uzi") || g_lms)
 		{
 			start_items = start_items | IT_UZI;
 			start_switchweapon = WEP_UZI;
 			weapon_action(start_switchweapon, WR_PRECACHE);
 		}
-		if (cvar("g_start_weapon_grenadelauncher") || cvar("g_lms"))
+		if (cvar("g_start_weapon_grenadelauncher") || g_lms)
 		{
 			start_items = start_items | IT_GRENADE_LAUNCHER;
 			start_switchweapon = WEP_GRENADE_LAUNCHER;
 			weapon_action(start_switchweapon, WR_PRECACHE);
 		}
-		if (cvar("g_start_weapon_electro") || cvar("g_lms"))
+		if (cvar("g_start_weapon_electro") || g_lms)
 		{
 			start_items = start_items | IT_ELECTRO;
 			start_switchweapon = WEP_ELECTRO;
 			weapon_action(start_switchweapon, WR_PRECACHE);
 		}
-		if (cvar("g_start_weapon_crylink") || cvar("g_lms"))
+		if (cvar("g_start_weapon_crylink") || g_lms)
 		{
 			start_items = start_items | IT_CRYLINK;
 			start_switchweapon = WEP_CRYLINK;
 			weapon_action(start_switchweapon, WR_PRECACHE);
 		}
-		if (cvar("g_start_weapon_nex") || cvar("g_lms"))
+		if (cvar("g_start_weapon_nex") || g_lms)
 		{
 			start_items = start_items | IT_NEX;
 			start_switchweapon = WEP_NEX;
 			weapon_action(start_switchweapon, WR_PRECACHE);
 		}
-		if (cvar("g_start_weapon_hagar") || cvar("g_lms"))
+		if (cvar("g_start_weapon_hagar") || g_lms)
 		{
 			start_items = start_items | IT_HAGAR;
 			start_switchweapon = WEP_HAGAR;
 			weapon_action(start_switchweapon, WR_PRECACHE);
 		}
-		if (cvar("g_start_weapon_rocketlauncher") || cvar("g_lms"))
+		if (cvar("g_start_weapon_rocketlauncher") || g_lms)
 		{
 			start_items = start_items | IT_ROCKET_LAUNCHER;
 			start_switchweapon = WEP_ROCKET_LAUNCHER;
diff --git a/data/qcsrc/server/mode_onslaught.qc b/data/qcsrc/server/mode_onslaught.qc
index 6bd8c92bd..264fda3d6 100644
--- a/data/qcsrc/server/mode_onslaught.qc
+++ b/data/qcsrc/server/mode_onslaught.qc
@@ -227,7 +227,7 @@ keys:
 */
 void() onslaught_generator =
 {
-	if (!cvar("g_onslaught"))
+	if (!g_onslaught)
 	{
 		remove(self);
 		return;
@@ -409,7 +409,7 @@ keys:
 void() onslaught_controlpoint =
 {
 	local entity e;
-	if (!cvar("g_onslaught"))
+	if (!g_onslaught)
 	{
 		remove(self);
 		return;
@@ -465,7 +465,7 @@ keys:
 */
 void() onslaught_link =
 {
-	if (!cvar("g_onslaught"))
+	if (!g_onslaught)
 	{
 		remove(self);
 		return;
diff --git a/data/qcsrc/server/t_items.qc b/data/qcsrc/server/t_items.qc
index 2cea39b0a..06f3c0da6 100644
--- a/data/qcsrc/server/t_items.qc
+++ b/data/qcsrc/server/t_items.qc
@@ -324,7 +324,7 @@ void StartItem (string itemmodel, string pickupsound, float defaultrespawntime,
 		}
 	}
 
-	if(cvar("g_lms") && (self.classname != "droppedweapon"))
+	if(g_lms && (self.classname != "droppedweapon"))
 	{
 		startitem_failed = TRUE;
 		remove(self);
@@ -638,7 +638,7 @@ void item_health100 (void) {
 	if(!cvar("g_powerup_superhealth"))
 		return;
 
-	if(cvar("g_arena") && !cvar("g_arena_powerups"))
+	if(g_arena && !cvar("g_arena_powerups"))
 		return;
 
 	if(cvar("g_minstagib")) {
@@ -656,7 +656,7 @@ void item_strength (void) {
 	if(!cvar("g_powerup_strength"))
 		return;
 
-	if(cvar("g_arena") && !cvar("g_arena_powerups"))
+	if(g_arena && !cvar("g_arena_powerups"))
 		return;
 
 	if(cvar("g_minstagib")) {
@@ -672,7 +672,7 @@ void item_invincible (void) {
 	if(!cvar("g_powerup_shield"))
 		return;
 
-	if(cvar("g_arena") && !cvar("g_arena_powerups"))
+	if(g_arena && !cvar("g_arena_powerups"))
 		return;
 
 	if(cvar("g_minstagib")) {
diff --git a/data/qcsrc/server/teamplay.qc b/data/qcsrc/server/teamplay.qc
index 468e8187b..4e9b17f30 100644
--- a/data/qcsrc/server/teamplay.qc
+++ b/data/qcsrc/server/teamplay.qc
@@ -14,8 +14,6 @@ float c1, c2, c3, c4;
 // # of bots on those teams
 float cb1, cb2, cb3, cb4;
 
-float g_domination, g_ctf, g_tdm, g_keyhunt, g_onslaught, g_assault;
-
 float audit_teams_time;
 
 float() IsTeamBalanceForced = {
@@ -127,7 +125,7 @@ void InitGameplayMode()
 
 	VoteReset();
 
-	game = cvar ("gamecfg");	// load game options
+	game = cvar("gamecfg");	// load game options
 
 	// game cvars get reset before map changes
 	// then map's cfg sets them as desired
@@ -323,10 +321,12 @@ void InitGameplayMode()
 
 	g_domination = cvar("g_domination");
 	g_ctf = cvar("g_ctf");
-	g_assault = cvar("g_assault");
+	g_lms = cvar("g_lms");
 	g_tdm = cvar("g_tdm");
 	g_keyhunt = cvar("g_keyhunt");
 	g_onslaught = cvar("g_onslaught");
+	g_assault = cvar("g_assault");
+	g_arena = cvar("g_arena");
 }
 
 string GetClientVersionMessage(float v) {
@@ -368,14 +368,14 @@ void PrintWelcomeMessage(entity pl)
 
 	if(self.classname == "observer")
 	{
-		if(cvar("g_lms") && self.frags <= 0 && self.frags > -666)
+		if(g_lms && self.frags <= 0 && self.frags > -666)
 			return centerprint(self, strcat(NEWLINES, "^1You have no more lives left\nwait for next round\n\n\n^7press attack to spectate other players"));
-		else if(cvar("g_lms") && self.frags == -666)
+		else if(g_lms && self.frags == -666)
 			return centerprint(self, strcat(NEWLINES, "^1Match has already begun\nwait for next round\n\n\n^7press attack to spectate other players"));
 	}
 	else if(self.classname == "spectator")
 	{
-		if ((cvar("g_lms") && self.frags < 1) || cvar("g_arena"))
+		if ((g_lms && self.frags < 1) || g_arena)
 			return centerprint(self, strcat(NEWLINES, "spectating ", self.enemy.netname, "\n\n\n^7press attack for next player\npress attack2 for free fly mode"));
 		else
 			return centerprint(self, strcat(NEWLINES, "spectating ", self.enemy.netname, "\n\n\n^7press jump to play\n^7press attack for next player\npress attack2 for free fly mode"));
@@ -421,7 +421,7 @@ void PrintWelcomeMessage(entity pl)
 		s = strcat(s, "^8\nactive modifications: ^3", modifications, "^8\n");
 
 	if((self.classname == "observer" || self.classname == "spectator") && self.version == cvar("gameversion")) {
-		if(!cvar("g_arena"))
+		if(!g_arena)
 			s = strcat(s,"^7\n\n\npress jump to play\npress attack to spectate other players\n\n");
 		else if(player_count < 2 && arena_roundbased)
 		{
@@ -825,7 +825,7 @@ float JoinBestTeam(entity pl, float only_return_best)
 	// find out what teams are available
 	CheckAllowedTeams(pl);
 
-	if(cvar("g_domination"))
+	if(g_domination)
 	{
 		if(cvar("g_domination_default_teams") < 3)
 			c3 = 999999999;
@@ -924,26 +924,6 @@ void SV_ChangeTeam(float _color)
 	else if(dcolor == COLOR_TEAM4 - 1)
 		dteam = 4;
 
-	// remap invalid teams in dom & ctf
-	/*
-	if(cvar("g_ctf") && dteam == 3)
-		dteam = 2;
-	else if(cvar("g_ctf") && dteam == 4)
-		dteam = 1;
-	else if((cvar("g_domination") && cvar("g_domination_default_teams") < 3) || (cvar("g_tdm") && cvar("g_tdm_teams") < 3))
-	{
-		if(dteam == 3)
-			dteam = 2;
-		else if(dteam == 4)
-			dteam = 1;
-	}
-	else if((cvar("g_domination") && cvar("g_domination_default_teams") < 4) || (cvar("g_tdm") && cvar("g_tdm_teams") < 4))
-	{
-		if(dteam == 4)
-			dteam = 1;
-	}
-	*/
-
 	CheckAllowedTeams(self);
 
 	if(dteam == 1 && c1 < 0) dteam = 4;
-- 
2.39.2