X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=qcsrc%2Fcommon%2Fstate.qh;h=42fc450c4728f97f4e63ca6fe9b196b79f2c0a53;hb=2bddfb42fdbb3318aa319d228d8c99adcc90b128;hp=94b9bc325f26288ebe8ccc8ff8cf67756366c334;hpb=34e7f534e2015466228eb3a78c9857741b736dca;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/state.qh b/qcsrc/common/state.qh
index 94b9bc325..42fc450c4 100644
--- a/qcsrc/common/state.qh
+++ b/qcsrc/common/state.qh
@@ -12,16 +12,6 @@ CLASS(PlayerState, Object)
 		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;
@@ -43,6 +33,10 @@ CLASS(ClientState, Object)
 		CONSTRUCT(ClientState);
 		this.m_client = client;
 	}
+	METHOD(PlayerState, ps_push, void(PlayerState this, entity cl))
+	{
+		TC(PlayerState, this);
+	}
 ENDCLASS(ClientState)
 
 .ClientState _cs;