X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fclient.qc;h=adfa40aeb6050de44535abf2368ba6dfe901f2ef;hp=0aa16c3baf299f3d30f8f5af0e1e4a649d1d21a7;hb=d865de7a9a17c5a1d9286aec40f68c3530697660;hpb=9b0bea7bd92dc8977654da12740e07a0509f412e

diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc
index 0aa16c3ba..adfa40aeb 100644
--- a/qcsrc/server/client.qc
+++ b/qcsrc/server/client.qc
@@ -270,7 +270,7 @@ void PutObserverInServer(entity this)
 	if (this.alivetime)
 	{
 		if (!warmup_stage)
-			PS_GR_P_ADDVAL(this, PLAYERSTATS_ALIVETIME, time - this.alivetime);
+			PlayerStats_GameReport_Event_Player(this, PLAYERSTATS_ALIVETIME, time - this.alivetime);
 		this.alivetime = 0;
 	}
 
@@ -507,7 +507,7 @@ void PutPlayerInServer(entity this)
 	accuracy_resend(this);
 
 	if (this.team < 0)
-		JoinBestTeam(this, false, true);
+		JoinBestTeam(this, true);
 
 	entity spot = SelectSpawnPoint(this, false);
 	if (!spot) {
@@ -558,6 +558,8 @@ void PutPlayerInServer(entity this)
 		this.health = start_health;
 		this.armorvalue = start_armorvalue;
 		this.weapons = start_weapons;
+		GiveRandomWeapons(this, random_start_weapons_count,
+			autocvar_g_random_start_weapons, random_start_ammo);
 	}
 	SetSpectatee_status(this, 0);
 
@@ -652,9 +654,11 @@ void PutPlayerInServer(entity this)
 
 	PHYS_INPUT_BUTTON_ATCK(this) = PHYS_INPUT_BUTTON_JUMP(this) = PHYS_INPUT_BUTTON_ATCK2(this) = false;
 
+	// player was spectator
 	if (CS(this).killcount == FRAGS_SPECTATOR) {
 		PlayerScore_Clear(this);
 		CS(this).killcount = 0;
+		CS(this).startplaytime = time;
 	}
 
 	for (int slot = 0; slot < MAX_WEAPONSLOTS; ++slot)
@@ -871,19 +875,19 @@ Called when a client types 'kill' in the console
 .float clientkill_nexttime;
 void ClientKill_Now_TeamChange(entity this)
 {
-	if(CS(this).killindicator_teamchange == -1)
+	if(this.killindicator_teamchange == -1)
 	{
-		JoinBestTeam( this, false, true );
+		JoinBestTeam( this, true );
 	}
-	else if(CS(this).killindicator_teamchange == -2)
+	else if(this.killindicator_teamchange == -2)
 	{
 		if(blockSpectators)
 			Send_Notification(NOTIF_ONE_ONLY, this, MSG_INFO, INFO_SPECTATE_WARNING, autocvar_g_maxplayers_spectator_blocktime);
 		PutObserverInServer(this);
 	}
 	else
-		SV_ChangeTeam(this, CS(this).killindicator_teamchange - 1);
-	CS(this).killindicator_teamchange = 0;
+		SV_ChangeTeam(this, this.killindicator_teamchange - 1);
+	this.killindicator_teamchange = 0;
 }
 
 void ClientKill_Now(entity this)
@@ -891,7 +895,7 @@ void ClientKill_Now(entity this)
 	if(this.vehicle)
 	{
 	    vehicles_exit(this.vehicle, VHEF_RELEASE);
-	    if(!CS(this).killindicator_teamchange)
+	    if(!this.killindicator_teamchange)
 	    {
             this.vehicle_health = -1;
             Damage(this, this, this, 1 , DEATH_KILL.m_id, this.origin, '0 0 0');
@@ -903,7 +907,7 @@ void ClientKill_Now(entity this)
 
 	this.killindicator = NULL;
 
-	if(CS(this).killindicator_teamchange)
+	if(this.killindicator_teamchange)
 		ClientKill_Now_TeamChange(this);
 
 	if (!IS_SPEC(this) && !IS_OBSERVER(this) && MUTATOR_CALLHOOK(ClientKill_Now, this) == false)
@@ -968,7 +972,7 @@ void ClientKill_TeamChange (entity this, float targetteam) // 0 = don't change,
     	return;
     killtime = M_ARGV(1, float);
 
-	CS(this).killindicator_teamchange = targetteam;
+	this.killindicator_teamchange = targetteam;
 
     if(!this.killindicator)
 	{
@@ -1185,7 +1189,7 @@ void ClientConnect(entity this)
     {
         int id = this.playerid;
         this.playerid = 0; // silent
-	    JoinBestTeam(this, false, false); // if the team number is valid, keep it
+	    JoinBestTeam(this, false); // if the team number is valid, keep it
 	    this.playerid = id;
     }
 
@@ -1215,8 +1219,6 @@ void ClientConnect(entity this)
 
 	CS(this).just_joined = true;  // stop spamming the eventlog with additional lines when the client connects
 
-	CS(this).netname_previous = strzone(this.netname);
-
 	if(teamplay && IS_PLAYER(this))
 		Send_Notification(NOTIF_ALL, NULL, MSG_INFO, APP_TEAM_NUM(this.team, INFO_JOIN_CONNECT_TEAM), this.netname);
 	else
@@ -2000,7 +2002,7 @@ void Join(entity this)
 
 	if(!this.team_selected)
 	if(autocvar_g_campaign || autocvar_g_balance_teams)
-		JoinBestTeam(this, false, true);
+		JoinBestTeam(this, true);
 
 	if(autocvar_g_campaign)
 		campaign_bots_may_start = true;
@@ -2492,19 +2494,22 @@ void PlayerPreThink (entity this)
 		// WORKAROUND: only use dropclient in server frames (frametime set).
 		// Never use it in cl_movement frames (frametime zero).
 		checkSpectatorBlock(this);
-    }
+	}
 
 	zoomstate_set = false;
 
 	// Check for nameless players
-	if (isInvisibleString(this.netname)) {
-		this.netname = strzone(sprintf("Player#%d", this.playerid));
-		// stuffcmd(this, strcat("name ", this.netname, "\n")); // maybe?
-	}
-	if (this.netname != CS(this).netname_previous) {
-		if (autocvar_sv_eventlog) {
+	if (this.netname == "" || this.netname != CS(this).netname_previous)
+	{
+		bool assume_unchanged = (CS(this).netname_previous == "");
+		if (isInvisibleString(this.netname))
+		{
+			this.netname = strzone(sprintf("Player#%d", this.playerid));
+			assume_unchanged = false;
+			// stuffcmd(this, strcat("name ", this.netname, "\n")); // maybe?
+		}
+		if (!assume_unchanged && autocvar_sv_eventlog)
 			GameLogEcho(strcat(":name:", ftos(this.playerid), ":", playername(this, false)));
-        }
 		if (CS(this).netname_previous) strunzone(CS(this).netname_previous);
 		CS(this).netname_previous = strzone(this.netname);
 	}