From: Mario <mario@smbclan.net>
Date: Sun, 16 Jul 2017 10:33:06 +0000 (+1000)
Subject: Port zoomstate and spectatee_status to ClientState
X-Git-Tag: xonotic-v0.8.5~2600
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0144925dd5ffcdf96dbb1fa53fc0c788463dcdd0;p=xonotic%2Fxonotic-data.pk3dir.git

Port zoomstate and spectatee_status to ClientState
---

diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc
index b29f785b9..9b105a28a 100644
--- a/qcsrc/server/client.qc
+++ b/qcsrc/server/client.qc
@@ -111,8 +111,8 @@ bool ClientData_Send(entity this, entity to, int sf)
 
 	sf = 0;
 	if (e.race_completed)       sf |= 1; // forced scoreboard
-	if (to.spectatee_status)    sf |= 2; // spectator ent number follows
-	if (e.zoomstate)            sf |= 4; // zoomed
+	if (CS(to).spectatee_status)    sf |= 2; // spectator ent number follows
+	if (CS(e).zoomstate)            sf |= 4; // zoomed
 	if (autocvar_sv_showspectators) sf |= 16; // show spectators
 
 	WriteHeader(MSG_ENTITY, ENT_CLIENT_CLIENTDATA);
@@ -120,7 +120,7 @@ bool ClientData_Send(entity this, entity to, int sf)
 
 	if (sf & 2)
 	{
-		WriteByte(MSG_ENTITY, to.spectatee_status);
+		WriteByte(MSG_ENTITY, CS(to).spectatee_status);
 	}
 
 	if(sf & 16)
@@ -1662,9 +1662,9 @@ void player_regen(entity this)
 bool zoomstate_set;
 void SetZoomState(entity this, float newzoom)
 {
-	if(newzoom != this.zoomstate)
+	if(newzoom != CS(this).zoomstate)
 	{
-		this.zoomstate = newzoom;
+		CS(this).zoomstate = newzoom;
 		ClientData_Touch(this);
 	}
 	zoomstate_set = true;
@@ -1742,7 +1742,7 @@ void SpectateCopy(entity this, entity spectatee)
 		this.fixangle = true;
 	setorigin(this, spectatee.origin);
 	setsize(this, spectatee.mins, spectatee.maxs);
-	SetZoomState(this, spectatee.zoomstate);
+	SetZoomState(this, CS(spectatee).zoomstate);
 
 	for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot)
 	{
@@ -1822,10 +1822,10 @@ bool SpectateSet(entity this)
 
 void SetSpectatee_status(entity this, int spectatee_num)
 {
-	int oldspectatee_status = this.spectatee_status;
-	this.spectatee_status = spectatee_num;
+	int oldspectatee_status = CS(this).spectatee_status;
+	CS(this).spectatee_status = spectatee_num;
 
-	if (this.spectatee_status != oldspectatee_status)
+	if (CS(this).spectatee_status != oldspectatee_status)
 	{
 		ClientData_Touch(this);
 		if (g_race || g_cts) race_InitSpectator();
diff --git a/qcsrc/server/client.qh b/qcsrc/server/client.qh
index be6cc0d60..ae4a08f90 100644
--- a/qcsrc/server/client.qh
+++ b/qcsrc/server/client.qh
@@ -91,6 +91,8 @@ CLASS(Client, Object)
     ATTRIB(Client, killcount, int, this.killcount);
     ATTRIB(Client, version_mismatch, bool, this.version_mismatch);
     ATTRIB(Client, version, int, this.version);
+    ATTRIB(Client, spectatee_status, int, this.spectatee_status);
+    ATTRIB(Client, zoomstate, bool, this.zoomstate);
 
     METHOD(Client, m_unwind, bool(Client this));