X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fcl_client.qc;h=955c0a45d2e0660d002343905515cf34f67b6647;hb=cc158c3008fa81c8dc5f92de8e4424042aa58024;hp=c601d92cda70d478dd0189c486807a252783f32d;hpb=4c4cb17a6d750a957ade68c0ffddc269b643cb2a;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index c601d92cd..955c0a45d 100644
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -6,14 +6,6 @@ void send_CSQC_teamnagger() {
 	WriteByte(0, TE_CSQC_TEAMNAGGER);
 }
 
-void send_CSQC_nexvelocity(entity e) {
-	msg_entity = e;
-	WriteByte(MSG_ONE, SVC_TEMPENTITY);
-	WriteByte(MSG_ONE, TE_CSQC_NEX_VELOCITY);
-	WriteShort(MSG_ONE, cvar("g_balance_nex_velocitydependent_minspeed"));
-	WriteShort(MSG_ONE, cvar("g_balance_nex_velocitydependent_maxspeed"));
-}
-
 void send_CSQC_cr_maxbullets(entity e) {
 	msg_entity = e;
 	WriteByte(MSG_ONE, SVC_TEMPENTITY);
@@ -897,6 +889,8 @@ void PutClientInServer (void)
 			self.effects = 0;
 		self.air_finished = time + 12;
 		self.dmg = 2;
+		if(cvar("g_balance_nex_charge"))
+			self.nex_charge = cvar("g_balance_nex_charge_start");
 
 		if(inWarmupStage)
 		{
@@ -1311,7 +1305,12 @@ void ClientKill_TeamChange (float targetteam) // 0 = don't change, -1 = auto
 
 void ClientKill (void)
 {
-	ClientKill_TeamChange(0);
+	if((g_arena || g_ca) && ((champion && champion.classname == "player" && player_count > 1) || player_count == 1)) // don't allow a kill in this case either
+	{
+		// do nothing
+	}
+	else
+		ClientKill_TeamChange(0);
 }
 
 void DoTeamChange(float destteam)
@@ -1403,10 +1402,6 @@ Called when a client connects to the server
 string ColoredTeamName(float t);
 void DecodeLevelParms (void);
 //void dom_player_join_team(entity pl);
-#ifdef UID
-.float uid_kicktime;
-.string uid;
-#endif
 void ClientConnect (void)
 {
 	float t;
@@ -1584,12 +1579,6 @@ void ClientConnect (void)
 	else
 		self.hitplotfh = -1;
 
-#ifdef UID
-	if(clienttype(self) == CLIENTTYPE_REAL)
-	if not(self.uid)
-		self.uid_kicktime = time + 60;
-#endif
-
 	if(g_race || g_cts) {
 		string rr;
 		if(g_cts)
@@ -1613,7 +1602,6 @@ void ClientConnect (void)
 	else if(cvar("sv_teamnagger") && !(cvar("bot_vs_human") && (c3==-1 && c4==-1)) && !g_ca) // teamnagger is currently bad for ca
 		send_CSQC_teamnagger();
 
-	send_CSQC_nexvelocity(self);
 	send_CSQC_cr_maxbullets(self);
 
 	CheatInitClient();
@@ -1707,6 +1695,8 @@ void ClientDisconnect (void)
 		strunzone(self.netname_previous);
 	if(self.clientstatus)
 		strunzone(self.clientstatus);
+	if(self.weaponorder_byimpulse)
+		strunzone(self.weaponorder_byimpulse);
 
 	ClearPlayerSounds();
 
@@ -2930,16 +2920,6 @@ void PlayerPostThink (void)
 		self.stat_count -= 1;
 	}
 
-#ifdef UID
-	if(self.uid_kicktime)
-	if(time > self.uid_kicktime)
-	{
-		bprint("^3", self.netname, "^3 was kicked for missing UID.\n");
-		dropclient(self);
-		return;
-	}
-#endif
-
 	if(sv_maxidle && frametime)
 	{
 		// WORKAROUND: only use dropclient in server frames (frametime set). Never use it in cl_movement frames (frametime zero).