X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fclient.qc;h=58bf67762fe2f852de1b335aaab134dff74170b7;hb=976e2ab8d154e70da6178e7b0f9d73bd720ddcd1;hp=db62a801f73120c67fa65caf2b4a23277970caa8;hpb=03ad91be14289755fee5873208001b1c7a1ab00b;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc
index db62a801f..58bf67762 100644
--- a/qcsrc/server/client.qc
+++ b/qcsrc/server/client.qc
@@ -855,19 +855,19 @@ Called when a client types 'kill' in the console
 .float clientkill_nexttime;
 void ClientKill_Now_TeamChange(entity this)
 {
-	if(this.killindicator_teamchange == -1)
+	if(CS(this).killindicator_teamchange == -1)
 	{
 		JoinBestTeam( this, false, true );
 	}
-	else if(this.killindicator_teamchange == -2)
+	else if(CS(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, this.killindicator_teamchange - 1);
-	this.killindicator_teamchange = 0;
+		SV_ChangeTeam(this, CS(this).killindicator_teamchange - 1);
+	CS(this).killindicator_teamchange = 0;
 }
 
 void ClientKill_Now(entity this)
@@ -875,7 +875,7 @@ void ClientKill_Now(entity this)
 	if(this.vehicle)
 	{
 	    vehicles_exit(this.vehicle, VHEF_RELEASE);
-	    if(!this.killindicator_teamchange)
+	    if(!CS(this).killindicator_teamchange)
 	    {
             this.vehicle_health = -1;
             Damage(this, this, this, 1 , DEATH_KILL.m_id, this.origin, '0 0 0');
@@ -887,7 +887,7 @@ void ClientKill_Now(entity this)
 
 	this.killindicator = NULL;
 
-	if(this.killindicator_teamchange)
+	if(CS(this).killindicator_teamchange)
 		ClientKill_Now_TeamChange(this);
 
 	if(!IS_SPEC(this) && !IS_OBSERVER(this))
@@ -950,7 +950,7 @@ void ClientKill_TeamChange (entity this, float targetteam) // 0 = don't change,
     	return;
     killtime = M_ARGV(1, float);
 
-	this.killindicator_teamchange = targetteam;
+	CS(this).killindicator_teamchange = targetteam;
 
     if(!this.killindicator)
 	{
@@ -2664,7 +2664,6 @@ PlayerPostThink
 Called every frame for each client after the physics are run
 =============
 */
-.float idlekick_lasttimeleft;
 void PlayerPostThink (entity this)
 {
 	Player_Physics(this);
@@ -2687,9 +2686,9 @@ void PlayerPostThink (entity this)
 		{ /* do nothing */ }
 		else if (time - CS(this).parm_idlesince < 1) // instead of (time == this.parm_idlesince) to support sv_maxidle <= 10
 		{
-			if (this.idlekick_lasttimeleft)
+			if (CS(this).idlekick_lasttimeleft)
 			{
-				this.idlekick_lasttimeleft = 0;
+				CS(this).idlekick_lasttimeleft = 0;
 				Kill_Notification(NOTIF_ONE_ONLY, this, MSG_CENTER, CPID_IDLING);
 			}
 		}
@@ -2697,7 +2696,7 @@ void PlayerPostThink (entity this)
 		{
 			float timeleft = ceil(sv_maxidle - (time - CS(this).parm_idlesince));
 			if (timeleft == min(10, sv_maxidle - 1)) { // - 1 to support sv_maxidle <= 10
-				if (!this.idlekick_lasttimeleft)
+				if (!CS(this).idlekick_lasttimeleft)
 					Send_Notification(NOTIF_ONE_ONLY, this, MSG_CENTER, CENTER_DISCONNECT_IDLING, timeleft);
 			}
 			if (timeleft <= 0) {
@@ -2706,10 +2705,10 @@ void PlayerPostThink (entity this)
 				return;
 			}
 			else if (timeleft <= 10) {
-				if (timeleft != this.idlekick_lasttimeleft) {
+				if (timeleft != CS(this).idlekick_lasttimeleft) {
 				    Send_Notification(NOTIF_ONE, this, MSG_ANNCE, Announcer_PickNumber(CNT_IDLE, timeleft));
                 }
-				this.idlekick_lasttimeleft = timeleft;
+				CS(this).idlekick_lasttimeleft = timeleft;
 			}
 		}
 	}