Merge branch 'martin-t/units' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / state.qc

diff --git a/qcsrc/common/state.qc b/qcsrc/common/state.qc
index d75e08027171aee5cf812333cb56367bb974a3e8..d3fd1d3bf41d80f70200330b5e336a7dc31e248c 100644 (file)
--- a/qcsrc/common/state.qc
+++ b/qcsrc/common/state.qc
@@ -15,9 +15,12 @@ void PlayerState_detach(entity this)
     PlayerState ps = PS(this);
        if (!ps) return;  // initial connect
        PS(this) = NULL;
+
        if (ps.m_client != this) return;  // don't own state, spectator
+       ps.ps_push(ps, this);
+
        FOREACH_CLIENT(PS(it) == ps, { PS(it) = NULL; });
-       remove(ps);
+       delete(ps);
 
     Inventory_delete(this);
 }
@@ -39,14 +42,12 @@ void ClientState_attach(entity this)
 
     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); }
-
        // 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);
@@ -59,8 +60,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);
@@ -68,18 +69,18 @@ void PlayerScore_Detach(entity this);
 
 void ClientState_detach(entity this)
 {
-       remove(CS(this));
+    accuracy_free(this); // TODO: needs to be before CS() is deleted!
+    PlayerScore_Detach(this); // what ^they^ said
+    W_HitPlotClose(this);
+    ClientData_Detach(this);
+       delete(CS(this));
        this._cs = NULL;
 
     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);
-    ClientData_Detach(this);
-    PlayerScore_Detach(self);
 }