X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fstate.qc;h=7c6882088dba4a604998fe824b866a66a16f2d68;hb=4760fc6e617c998a50302f1d7ad76fdf868115af;hp=1e7582d79f673fe863fa809dd67af42670d18c41;hpb=bd7038146e8b9decebe5b9f852d2ee3d3ef2bfac;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/state.qc b/qcsrc/common/state.qc
index 1e7582d79..7c6882088 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;
+    PlayerState ps = PS(this);
+	if (!ps) return;  // initial connect
+	PS(this) = NULL;
 
-    Inventory_delete(self);
+	ps.m_switchweapon = WEP_Null;
+	ps.m_weapon = WEP_Null;
+	ps.m_switchingweapon = WEP_Null;
+	ps.ps_push(ps, this);
+
+	if (ps.m_client != this) return;  // don't own state, spectator
+	FOREACH_CLIENT(PS(it) == ps, { PS(it) = NULL; });
+	remove(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,10 +43,9 @@ void ClientState_attach(entity this)
 {
 	this._cs = NEW(ClientState, this);
 
-    GetCvars(0);  // get other cvars from player
+    GetCvars(this, 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); }
+	if (IS_REAL_CLIENT(this)) { PlayerStats_PlayerBasic_CheckUpdate(this); }
 
 	// TODO: fold all of these into ClientState
 
@@ -58,7 +65,7 @@ void ClientState_attach(entity this)
 void bot_clientdisconnect(entity this);
 void W_HitPlotClose(entity this);
 void anticheat_report(entity this);
-void playerdemo_shutdown();
+void playerdemo_shutdown(entity this);
 void entcs_detach(entity this);
 void accuracy_free(entity this);
 void ClientData_Detach(entity this);
@@ -69,15 +76,15 @@ void ClientState_detach(entity this)
 	remove(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();
+    playerdemo_shutdown(this);
     entcs_detach(this);
-    accuracy_free(self);
+    accuracy_free(this);
     ClientData_Detach(this);
-    PlayerScore_Detach(self);
+    PlayerScore_Detach(this);
 }