X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fstate.qh;h=42fc450c4728f97f4e63ca6fe9b196b79f2c0a53;hb=96da95e33a8988acfacf2d01cd23c6ceb751191d;hp=110df1c575840421fb05a47ebb66cc16c89f8efa;hpb=eac60648c4017e495060dd3ba9e50ac4bad5000a;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/state.qh b/qcsrc/common/state.qh
index 110df1c57..42fc450c4 100644
--- a/qcsrc/common/state.qh
+++ b/qcsrc/common/state.qh
@@ -6,22 +6,12 @@
  * Server: instance per client, clients decoupled from players
  */
 CLASS(PlayerState, Object)
-	ATTRIB(PlayerState, m_client, entity, NULL)
+	ATTRIB(PlayerState, m_client, entity);
 	CONSTRUCTOR(PlayerState, entity client)
 	{
 		CONSTRUCT(PlayerState);
 		this.m_client = client;
 	}
-	ATTRIB(PlayerState, m_switchingweapon, Weapon, Weapons_from(-1))
-	ATTRIB(PlayerState, m_switchweapon, Weapon, Weapons_from(-1))
-	ATTRIB(PlayerState, m_weapon, Weapon, Weapons_from(-1))
-	METHOD(PlayerState, ps_push, void(PlayerState this, entity cl))
-	{
-	    TC(PlayerState, this);
-		STAT(ACTIVEWEAPON, cl) = this.m_weapon.m_id;
-		STAT(SWITCHINGWEAPON, cl) = this.m_switchingweapon.m_id;
-		STAT(SWITCHWEAPON, cl) = this.m_switchweapon.m_id;
-	}
 ENDCLASS(PlayerState)
 
 .PlayerState _ps;
@@ -37,12 +27,16 @@ void PlayerState_detach(entity this);
  * Server: instance per client
  */
 CLASS(ClientState, Object)
-	ATTRIB(ClientState, m_client, entity, NULL)
+	ATTRIB(ClientState, m_client, entity);
 	CONSTRUCTOR(ClientState, entity client)
 	{
 		CONSTRUCT(ClientState);
 		this.m_client = client;
 	}
+	METHOD(PlayerState, ps_push, void(PlayerState this, entity cl))
+	{
+		TC(PlayerState, this);
+	}
 ENDCLASS(ClientState)
 
 .ClientState _cs;