X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fstate.qc;h=d174eeb6bac526e0bfd0a0fba21b779384456e97;hb=b6ba746be4f92f302783a453a73462f771557ac3;hp=37813ef716c0bd5f393bc45a1f2fad39036e7b0b;hpb=bc3f297ed082b23fb33dd0d8f5dcd33bb0198507;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/state.qc b/qcsrc/common/state.qc
index 37813ef71..d174eeb6b 100644
--- a/qcsrc/common/state.qc
+++ b/qcsrc/common/state.qc
@@ -1,13 +1,22 @@
 #include "state.qh"
 
-void Inventory_new(entity this);
+#include <common/mutators/mutator/status_effects/_mod.qh>
+#include <server/command/getreplies.qh>
+
+void Inventory_new(PlayerState this);
 void Inventory_delete(entity this);
+void Inventory_clear(PlayerState this);
+void InventoryStorage_attach(PlayerState this);
+void InventoryStorage_delete(PlayerState this);
 
 void PlayerState_attach(entity this)
 {
+	if (PS(this) && PS(this).m_client == this)
+		return;
+
 	this._ps = NEW(PlayerState, this);
 
-	Inventory_new(this);
+	Inventory_new(PS(this));
 }
 
 void PlayerState_detach(entity this)
@@ -15,17 +24,16 @@ void PlayerState_detach(entity this)
     PlayerState ps = PS(this);
 	if (!ps) return;  // initial connect
 	PS(this) = NULL;
+    Inventory_clear(this.inventory_store); // no need to network updates, as there is no inventory attached
 
 	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);
 void DecodeLevelParms(entity this);
 void PlayerScore_Attach(entity this);
 void ClientData_Attach(entity this);
@@ -39,8 +47,6 @@ void ClientState_attach(entity this)
 {
 	this._cs = NEW(ClientState, this);
 
-    GetCvars(this, CS(this), 0);  // get other cvars from player
-
 	// TODO: fold all of these into ClientState
 
 	DecodeLevelParms(this);
@@ -52,8 +58,8 @@ void ClientState_attach(entity this)
 	entcs_attach(this);
 	anticheat_init(this);
 	W_HitPlotOpen(this);
-
-	bot_clientconnect(this);
+	InventoryStorage_attach(this);
+	StatusEffectsStorage_attach(this);
 }
 
 void bot_clientdisconnect(entity this);
@@ -66,17 +72,18 @@ void PlayerScore_Detach(entity this);
 
 void ClientState_detach(entity this)
 {
-    GetCvars(this, CS(this), -1);  // free cvars TODO: is this still needed now that it's stored on the clientstate entity?
+    GetCvars(this, CS_CVAR(this), -1);  // free cvars TODO: is this still needed now that it's stored on the clientstate entity?
     accuracy_free(this); // TODO: needs to be before CS() is deleted!
     PlayerScore_Detach(this); // what ^they^ said
     W_HitPlotClose(this);
     ClientData_Detach(this);
+    entcs_detach(this);
+    InventoryStorage_delete(this);
+    StatusEffectsStorage_delete(this);
 	delete(CS(this));
 	this._cs = NULL;
 
-
     bot_clientdisconnect(this);
 
     anticheat_report_to_eventlog(this);
-    entcs_detach(this);
 }