X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fstate.qc;h=2a1168eae017978fe7f56d72004bda716fc49344;hb=97ead695d25a6f24ee9d9837664e05456692af9d;hp=37813ef716c0bd5f393bc45a1f2fad39036e7b0b;hpb=4096ab0591cbd7fac803e022375cd3c221511d8b;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/state.qc b/qcsrc/common/state.qc
index 37813ef71..2a1168eae 100644
--- a/qcsrc/common/state.qc
+++ b/qcsrc/common/state.qc
@@ -1,13 +1,13 @@
 #include "state.qh"
 
-void Inventory_new(entity this);
+void Inventory_new(PlayerState this);
 void Inventory_delete(entity this);
 
 void PlayerState_attach(entity this)
 {
 	this._ps = NEW(PlayerState, this);
 
-	Inventory_new(this);
+	Inventory_new(PS(this));
 }
 
 void PlayerState_detach(entity this)
@@ -18,11 +18,10 @@ void PlayerState_detach(entity this)
 
 	if (ps.m_client != this) return;  // don't own state, spectator
 	ps.ps_push(ps, this);
+    Inventory_delete(ps);
 
 	FOREACH_CLIENT(PS(it) == ps, { PS(it) = NULL; });
 	delete(ps);
-
-    Inventory_delete(this);
 }
 
 void GetCvars(entity this, entity store, int);
@@ -52,8 +51,6 @@ void ClientState_attach(entity this)
 	entcs_attach(this);
 	anticheat_init(this);
 	W_HitPlotOpen(this);
-
-	bot_clientconnect(this);
 }
 
 void bot_clientdisconnect(entity this);
@@ -71,12 +68,11 @@ void ClientState_detach(entity this)
     PlayerScore_Detach(this); // what ^they^ said
     W_HitPlotClose(this);
     ClientData_Detach(this);
+    entcs_detach(this);
 	delete(CS(this));
 	this._cs = NULL;
 
-
     bot_clientdisconnect(this);
 
     anticheat_report_to_eventlog(this);
-    entcs_detach(this);
 }