X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fstate.qc;h=a9bc3e5e3cf8aa379ead84d3cc37163b70e46df1;hp=0ffe55eb4fa50ba77a3c0c22ddb5c2b4defa2812;hb=64f2b309aa5be8aafb9ad2137174bb6d99aeb876;hpb=10c0e93c75ef6f408e3357bd5fb46c721e7e0576

diff --git a/qcsrc/common/state.qc b/qcsrc/common/state.qc
index 0ffe55eb4..a9bc3e5e3 100644
--- a/qcsrc/common/state.qc
+++ b/qcsrc/common/state.qc
@@ -15,9 +15,11 @@ 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
+	
 	FOREACH_CLIENT(PS(it) == ps, { PS(it) = NULL; });
-	remove(ps);
+	delete(ps);
 
     Inventory_delete(this);
 }
@@ -39,13 +41,12 @@ void ClientState_attach(entity this)
 
     GetCvars(this, 0);  // get other cvars from player
 
-	if (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);
@@ -58,7 +59,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);
@@ -67,7 +68,7 @@ void PlayerScore_Detach(entity this);
 
 void ClientState_detach(entity this)
 {
-	remove(CS(this));
+	delete(CS(this));
 	this._cs = NULL;
 
     GetCvars(this, -1);  // free cvars
@@ -75,7 +76,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);