X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fcl_client.qc;fp=qcsrc%2Fserver%2Fcl_client.qc;h=d73772b72bf012339133614e9df4b55035081f07;hb=01bfb087092f257025957a55535b777634a31790;hp=b3d326264e0a2a702843ae0b874714d6eb11f0cf;hpb=ef44c5f1fc1dd00a4f07f7cfcc35f6cd07c44e10;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index b3d326264..d73772b72 100644
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -1523,6 +1523,7 @@ Called when a client connects to the server
 string ColoredTeamName(float t);
 void DecodeLevelParms (void);
 //void dom_player_join_team(entity pl);
+void set_dom_state(entity e);
 void ClientConnect (void)
 {
 	float t;
@@ -1764,9 +1765,19 @@ void ClientConnect (void)
 	else if(autocvar_sv_teamnagger && !(autocvar_bot_vs_human && (c3==-1 && c4==-1)) && !g_ca) // teamnagger is currently bad for ca
 		send_CSQC_teamnagger();
 
+	if (g_domination)
+		set_dom_state(self);
+
 	CheatInitClient();
 
 	PlayerStats_AddPlayer(self);
+
+    self.shownames = spawn();
+    self.shownames.owner = self;
+    self.shownames.think = shownames_think;
+    self.shownames.nextthink = time;
+	self.shownames.customizeentityforclient = shownames_customize;
+    Net_LinkEntity(self.shownames, FALSE, 0, SendEntity_ShowNames);
 }
 
 /*
@@ -1866,6 +1877,8 @@ void ClientDisconnect (void)
 	self.playerid = 0;
 	ReadyCount();
 
+    remove(self.shownames);
+
 	// free cvars
 	GetCvars(-1);
 }
@@ -2715,9 +2728,6 @@ void PlayerPreThink (void)
 			return;					// the think tics
 		}
 
-		if(frametime > 0) // don't do this in cl_movement frames, just in server ticks
-			UpdateSelectedPlayer();
-
 		//don't allow the player to turn around while game is paused!
 		if(timeoutStatus == 2) {
 			self.v_angle = self.lastV_angle;