X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fstate.qc;h=1a2fb1e7bfb171bb0405c1f8a02f83f09bde43dd;hp=1e7582d79f673fe863fa809dd67af42670d18c41;hb=34e7f534e2015466228eb3a78c9857741b736dca;hpb=77d6a05629e33da863fccb3cdd03b3c63af890dd

diff --git a/qcsrc/common/state.qc b/qcsrc/common/state.qc
index 1e7582d79..1a2fb1e7b 100644
--- a/qcsrc/common/state.qc
+++ b/qcsrc/common/state.qc
@@ -12,15 +12,23 @@ void PlayerState_attach(entity this)
 
 void PlayerState_detach(entity this)
 {
-	if (!PS(this)) return;  // initial connect
-	FOREACH_CLIENT(PS(it) == PS(this), { PS(it) = NULL; });
-	remove(PS(this));
-	this._ps = NULL;
-
-    Inventory_delete(self);
+    PlayerState ps = PS(this);
+	if (!ps) return;  // initial connect
+	PS(this) = NULL;
+
+	if (ps.m_client != this) return;  // don't own state, spectator
+	ps.m_switchweapon = WEP_Null;
+	ps.m_weapon = WEP_Null;
+	ps.m_switchingweapon = WEP_Null;
+	ps.ps_push(ps, this);
+	
+	FOREACH_CLIENT(PS(it) == ps, { PS(it) = NULL; });
+	delete(ps);
+
+    Inventory_delete(this);
 }
 
-void GetCvars(int);
+void GetCvars(entity this, int);
 void DecodeLevelParms(entity this);
 void PlayerScore_Attach(entity this);
 void ClientData_Attach(entity this);
@@ -35,16 +43,14 @@ void ClientState_attach(entity this)
 {
 	this._cs = NEW(ClientState, this);
 
-    GetCvars(0);  // get other cvars from player
-
-	// TODO: xonstat elo.txt support, until then just 404s
-	if (false && IS_REAL_CLIENT(this)) { PlayerStats_PlayerBasic_CheckUpdate(this); }
+    GetCvars(this, 0);  // get other cvars from player
 
 	// TODO: fold all of these into ClientState
 
 	DecodeLevelParms(this);
 
 	PlayerScore_Attach(this);
+	PlayerStats_PlayerBasic_CheckUpdate(this);
 	ClientData_Attach(this);
 	accuracy_init(this);
 	entcs_attach(this);
@@ -57,8 +63,8 @@ void ClientState_attach(entity this)
 
 void bot_clientdisconnect(entity this);
 void W_HitPlotClose(entity this);
-void anticheat_report(entity this);
-void playerdemo_shutdown();
+void anticheat_report_to_eventlog(entity this);
+void playerdemo_shutdown(entity this);
 void entcs_detach(entity this);
 void accuracy_free(entity this);
 void ClientData_Detach(entity this);
@@ -66,18 +72,18 @@ void PlayerScore_Detach(entity this);
 
 void ClientState_detach(entity this)
 {
-	remove(CS(this));
+	delete(CS(this));
 	this._cs = NULL;
 
-    GetCvars(-1);  // free cvars
+    GetCvars(this, -1);  // free cvars
 
     bot_clientdisconnect(this);
 
     W_HitPlotClose(this);
-    anticheat_report(this);
-    playerdemo_shutdown();
+    anticheat_report_to_eventlog(this);
+    playerdemo_shutdown(this);
     entcs_detach(this);
-    accuracy_free(self);
+    accuracy_free(this);
     ClientData_Detach(this);
-    PlayerScore_Detach(self);
+    PlayerScore_Detach(this);
 }