X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=qcsrc%2Fcommon%2Fstate.qc;h=772dbccbd58d870137b69ab4143fc053e3b02e81;hb=77ffd30cbf1e94a546f70026e69e56e8d777ba83;hp=1a2fb1e7bfb171bb0405c1f8a02f83f09bde43dd;hpb=429e52163f53e75b848135f076b77c4eb43935ac;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/state.qc b/qcsrc/common/state.qc
index 1a2fb1e7b..772dbccbd 100644
--- a/qcsrc/common/state.qc
+++ b/qcsrc/common/state.qc
@@ -17,24 +17,20 @@ void PlayerState_detach(entity this)
 	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);
-	
+
 	FOREACH_CLIENT(PS(it) == ps, { PS(it) = NULL; });
 	delete(ps);
 
     Inventory_delete(this);
 }
 
-void GetCvars(entity this, int);
+void GetCvars(entity this, entity store, int);
 void DecodeLevelParms(entity this);
 void PlayerScore_Attach(entity this);
 void ClientData_Attach(entity this);
 void accuracy_init(entity this);
 void entcs_attach(entity this);
-void playerdemo_init(entity this);
 void anticheat_init(entity this);
 void W_HitPlotOpen(entity this);
 void bot_clientconnect(entity this);
@@ -43,7 +39,7 @@ void ClientState_attach(entity this)
 {
 	this._cs = NEW(ClientState, this);
 
-    GetCvars(this, 0);  // get other cvars from player
+    GetCvars(this, CS(this), 0);  // get other cvars from player
 
 	// TODO: fold all of these into ClientState
 
@@ -54,17 +50,13 @@ void ClientState_attach(entity this)
 	ClientData_Attach(this);
 	accuracy_init(this);
 	entcs_attach(this);
-	playerdemo_init(this);
 	anticheat_init(this);
 	W_HitPlotOpen(this);
-
-	bot_clientconnect(this);
 }
 
 void bot_clientdisconnect(entity this);
 void W_HitPlotClose(entity this);
 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);
@@ -72,18 +64,17 @@ 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?
+    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_to_eventlog(this);
-    playerdemo_shutdown(this);
     entcs_detach(this);
-    accuracy_free(this);
-    ClientData_Detach(this);
-    PlayerScore_Detach(this);
 }