X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fcl_client.qc;h=3a416375b3874eb41a6593fb8933e9a5813bb4d6;hp=4eb3d585858498994c0f5d3b928557bd1798e78e;hb=ac46eb66c927d1d4c0c61f1ada5efe7fc847ac63;hpb=6b89adf7bf5d63745c2baa2c8cb81e086c967b8c

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index 4eb3d58585..3a416375b3 100644
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -802,8 +802,8 @@ void FixPlayermodel()
 
 	if(!teams_matter)
 		if(strlen(cvar_string("sv_defaultplayercolors")))
-			if(self.clientcolors != cvar("sv_defaultplayercolors"))
-				setcolor(self, cvar("sv_defaultplayercolors"));
+			if(self.clientcolors != stof(cvar_string("sv_defaultplayercolors")))
+				setcolor(self, stof(cvar_string("sv_defaultplayercolors")));
 }
 
 void PlayerTouchExplode(entity p1, entity p2)
@@ -900,8 +900,8 @@ void PutClientInServer (void)
 		self.dmg = 2;
 		if(cvar("g_balance_nex_charge"))
 		{
-			if(cvar("g_balance_nex_secondary_charge_pool"))
-				self.nex_charge_pool_ammo = 1;
+			if(cvar("g_balance_nex_secondary_chargepool"))
+				self.nex_chargepool_ammo = 1;
 			self.nex_charge = cvar("g_balance_nex_charge_start");
 		}
 
@@ -1619,9 +1619,6 @@ void ClientConnect (void)
 	// get other cvars from player
 	GetCvars(0);
 
-	// set cvar for team scoreboard
-	stuffcmd(self, strcat("set teamplay ", ftos(teamplay), "\n"));
-
 	// notify about available teams
 	if(teams_matter)
 	{
@@ -3065,7 +3062,7 @@ void PlayerPostThink (void)
 
 	playerdemo_write();
 
-	if((g_cts || g_race) && self.cvar_cl_allow_uid2name)
+	if((g_cts || g_race) && self.cvar_cl_allow_uid2name == 1)
 	{
 		if(!self.stored_netname)
 			self.stored_netname = strzone(uid2name(self.crypto_idfp));