X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fcl_client.qc;h=1078eea1308df0c90c4d2f00b07710568894a118;hp=adea40c4b946d385ec9aa735812f99cca416c9b9;hb=3185672106d544aa84cb7ed518fc874519d2c317;hpb=d63134c838f8633a5f076bff0caf76c4a4e8ed80

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index adea40c4b..1078eea13 100644
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -407,10 +407,11 @@ void PutObserverInServer (void)
 	minstagib_stop_countdown(self);
 
 	Portal_ClearAll(self);
-
+	
 	if(self.alivetime)
 	{
-		PlayerStats_Event(self, PLAYERSTATS_ALIVETIME, time - self.alivetime);
+		if(!inWarmupStage)
+			PlayerStats_Event(self, PLAYERSTATS_ALIVETIME, time - self.alivetime);
 		self.alivetime = 0;
 	}
 
@@ -511,11 +512,13 @@ void PutObserverInServer (void)
 	{
 		if(self.version_mismatch)
 		{
+			self.frags = FRAGS_SPECTATOR;
 			Spawnqueue_Unmark(self);
 			Spawnqueue_Remove(self);
 		}
 		else
 		{
+			self.frags = FRAGS_LMS_LOSER;
 			Spawnqueue_Insert(self);
 		}
 	}
@@ -534,6 +537,13 @@ void PutObserverInServer (void)
 		else
 			self.frags = FRAGS_SPECTATOR;
 	}
+	else if((g_race && g_race_qualifying) || g_cts)
+	{
+		if(PlayerScore_Add(self, SP_RACE_FASTEST, 0))
+			self.frags = FRAGS_LMS_LOSER;
+		else
+			self.frags = FRAGS_SPECTATOR;
+	}
 	else
 		self.frags = FRAGS_SPECTATOR;
 }
@@ -913,8 +923,9 @@ void PutClientInServer (void)
 		self.weaponname = "";
 		self.switchingweapon = 0;
 
-		if(!self.alivetime)
-			self.alivetime = time;
+		if(!inWarmupStage)
+			if(!self.alivetime)
+				self.alivetime = time;
 
 		antilag_clear(self);
 
@@ -1381,9 +1392,6 @@ void ClientConnect (void)
 
 	race_PreSpawnObserver();
 
-	//if(g_domination)
-	//	dom_player_join_team(self);
-
 	// identify the right forced team
 	if(autocvar_g_campaign)
 	{
@@ -1569,9 +1577,6 @@ 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();
 
 	if(!autocvar_g_campaign)