Merge branch 'master' into Mirio/balance

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

diff --git a/qcsrc/common/state.qc b/qcsrc/common/state.qc
index eaa96892f64aba3e9e1cb38f5b2e34af51358ed3..1a2fb1e7bfb171bb0405c1f8a02f83f09bde43dd 100644 (file)
--- a/qcsrc/common/state.qc
+++ b/qcsrc/common/state.qc
@@ -16,12 +16,12 @@ void PlayerState_detach(entity 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);
-
-       if (ps.m_client != this) return;  // don't own state, spectator
+       
        FOREACH_CLIENT(PS(it) == ps, { PS(it) = NULL; });
        delete(ps);
 
@@ -63,7 +63,7 @@ void ClientState_attach(entity this)
 
 void bot_clientdisconnect(entity this);
 void W_HitPlotClose(entity this);
-void anticheat_report(entity this);
+void anticheat_report_to_eventlog(entity this);
 void playerdemo_shutdown(entity this);
 void entcs_detach(entity this);
 void accuracy_free(entity this);
@@ -80,7 +80,7 @@ void ClientState_detach(entity this)
     bot_clientdisconnect(this);
 
     W_HitPlotClose(this);
-    anticheat_report(this);
+    anticheat_report_to_eventlog(this);
     playerdemo_shutdown(this);
     entcs_detach(this);
     accuracy_free(this);