X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fcl_client.qc;h=ca94d967abf6afa79cd7b8f3209c49a8db935dc0;hp=f732600d82f7058eb4fe2d7a66dc38563a2bee48;hb=4b15b999e2716d2ddc35075f75910b330a6cbf5c;hpb=99eb3d6820995625e446e07bb417969192eb4122

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index f732600d82..ca94d967ab 100644
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -1501,8 +1501,6 @@ void ClientConnect (void)
 	else
 		stuffcmd(self, "set _teams_available 0\n");
 
-	stuffcmd(self, strcat("set gametype ", ftos(game), "\n"));
-
 	if(g_arena || g_ca)
 	{
 		self.classname = "observer";
@@ -2918,10 +2916,8 @@ void PlayerPostThink (void)
 		stuffcmd(self, strcat("name ", self.netname, substring(ftos(random()), 2, -1), "\n"));
 	}
 
-	if(sv_maxidle && frametime)
+	if(sv_maxidle && frametime) // WORKAROUND: only use dropclient in server frames (frametime set). Never use it in cl_movement frames (frametime zero).
 	{
-		// WORKAROUND: only use dropclient in server frames (frametime set). Never use it in cl_movement frames (frametime zero).
-		float timeleft;
 		if (time - self.parm_idlesince < 1) // instead of (time == self.parm_idlesince) to support sv_maxidle <= 10
 		{
 			if(self.idlekick_lasttimeleft)
@@ -2929,34 +2925,37 @@ void PlayerPostThink (void)
 				Send_CSQC_Centerprint_Generic_Expire(self, CPID_DISCONNECT_IDLING);
 				self.idlekick_lasttimeleft = 0;
 			}
-			return;
-		}
-		timeleft = ceil(sv_maxidle - (time - self.parm_idlesince));
-		if(timeleft == min(10, sv_maxidle - 1)) // - 1 to support sv_maxidle <= 10
-		{
-			if(!self.idlekick_lasttimeleft)
-				Send_CSQC_Centerprint_Generic(self, CPID_DISCONNECT_IDLING, "^3Stop idling!\n^3Disconnecting in %d seconds...", 1, timeleft);
-		}
-		if(timeleft <= 0)
-		{
-			bprint("^3", self.netname, "^3 was kicked for idling.\n");
-			AnnounceTo(self, "terminated");
-			dropclient(self);
-			return;
 		}
-		else if(timeleft <= 10)
+		else
 		{
-			if(timeleft != self.idlekick_lasttimeleft)
-				AnnounceTo(self, ftos(timeleft));
-			self.idlekick_lasttimeleft = timeleft;
+			float timeleft;
+			timeleft = ceil(sv_maxidle - (time - self.parm_idlesince));
+			if(timeleft == min(10, sv_maxidle - 1)) // - 1 to support sv_maxidle <= 10
+			{
+				if(!self.idlekick_lasttimeleft)
+					Send_CSQC_Centerprint_Generic(self, CPID_DISCONNECT_IDLING, "^3Stop idling!\n^3Disconnecting in %d seconds...", 1, timeleft);
+			}
+			if(timeleft <= 0)
+			{
+				bprint("^3", self.netname, "^3 was kicked for idling.\n");
+				AnnounceTo(self, "terminated");
+				dropclient(self);
+				return;
+			}
+			else if(timeleft <= 10)
+			{
+				if(timeleft != self.idlekick_lasttimeleft)
+					AnnounceTo(self, ftos(timeleft));
+				self.idlekick_lasttimeleft = timeleft;
+			}
 		}
 	}
 
 #ifdef TETRIS
 	if(self.impulse == 100)
 		ImpulseCommands();
-	if (TetrisPostFrame())
-		return;
+	if (!TetrisPostFrame())
+	{
 #endif
 
 	CheatFrame();
@@ -2977,6 +2976,10 @@ void PlayerPostThink (void)
 		//do nothing
 	}
 	
+#ifdef TETRIS
+	}
+#endif
+
 	/*
 	float i;
 	for(i = 0; i < 1000; ++i)