X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fstate.qh;h=7656d47e66ac566d2f1ae394204ef1716d0db97a;hb=4f7f52f56bc339a393aaec64d2c93ab0fe809984;hp=94b9bc325f26288ebe8ccc8ff8cf67756366c334;hpb=9185b58da6fe5f2b095d7066577e1e024b4d2798;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/state.qh b/qcsrc/common/state.qh
index 94b9bc325..7656d47e6 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;
@@ -53,5 +47,8 @@ ENDCLASS(ClientState)
 	ClientState CS(Client this) { TC(Client, this); assert(this._cs); return this._cs; }
 #endif
 
+// NOTE: this exists to ease migration later on - ClientState does not exist early enough for replicated cvars!
+#define CS_CVAR(this) (this)
+
 void ClientState_attach(entity this);
 void ClientState_detach(entity this);