From 48a9740067c53a0b39ef219c7436a03f4ba0a87a Mon Sep 17 00:00:00 2001
From: Marco Cawthorne <marco@vera-visions.com>
Date: Wed, 30 Nov 2022 14:31:55 -0800
Subject: [PATCH] Remove references to client/player.qc

---
 src/client/progs.src   |  1 -
 src/server/gamerules.h |  2 --
 src/shared/player.qc   | 69 ++++++++++++++++++++----------------------
 3 files changed, 33 insertions(+), 39 deletions(-)

diff --git a/src/client/progs.src b/src/client/progs.src
index 1e73112..0576f04 100644
--- a/src/client/progs.src
+++ b/src/client/progs.src
@@ -23,7 +23,6 @@
 draw.qc
 ../../../valve/src/client/init.qc
 ../../../valve/src/client/flashlight.qc
-../../../valve/src/client/player.qc
 ../../../valve/src/client/entities.qc
 cmds.qc
 ../../../valve/src/client/game_event.qc
diff --git a/src/server/gamerules.h b/src/server/gamerules.h
index c0689fe..ead44b8 100644
--- a/src/server/gamerules.h
+++ b/src/server/gamerules.h
@@ -14,8 +14,6 @@
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include "../../../src/server/gamerules.h"
-
 class HLGameRules:CGameRules
 {
 	int m_iScientistsAlive;
diff --git a/src/shared/player.qc b/src/shared/player.qc
index 5d89f1b..7b03801 100644
--- a/src/shared/player.qc
+++ b/src/shared/player.qc
@@ -30,47 +30,44 @@ enumflags
 class player:NSClientPlayer
 {
 	/* Weapon specific */
-	PREDICTED_INT(glock_mag);
-	PREDICTED_INT(mp5_mag);
-	PREDICTED_INT(python_mag);
-	PREDICTED_INT(shotgun_mag);
-	PREDICTED_INT(crossbow_mag);
-	PREDICTED_INT(rpg_mag);
-	PREDICTED_INT(satchel_chg);
-	PREDICTED_INT(cannon_mag);
+	PREDICTED_INT(glock_mag)
+	PREDICTED_INT(mp5_mag)
+	PREDICTED_INT(python_mag)
+	PREDICTED_INT(shotgun_mag)
+	PREDICTED_INT(crossbow_mag)
+	PREDICTED_INT(rpg_mag)
+	PREDICTED_INT(satchel_chg)
+	PREDICTED_INT(cannon_mag)
 
-	PREDICTED_INT(ammo_9mm);
-	PREDICTED_INT(ammo_357);
-	PREDICTED_INT(ammo_buckshot);
-	PREDICTED_INT(ammo_bolt);
-	PREDICTED_INT(ammo_rocket);
-	PREDICTED_INT(ammo_uranium);
-	PREDICTED_INT(ammo_handgrenade);
-	PREDICTED_INT(ammo_satchel);
-	PREDICTED_INT(ammo_tripmine);
-	PREDICTED_INT(ammo_snark);
-	PREDICTED_INT(ammo_hornet);
+	PREDICTED_INT(ammo_9mm)
+	PREDICTED_INT(ammo_357)
+	PREDICTED_INT(ammo_buckshot)
+	PREDICTED_INT(ammo_bolt)
+	PREDICTED_INT(ammo_rocket)
+	PREDICTED_INT(ammo_uranium)
+	PREDICTED_INT(ammo_handgrenade)
+	PREDICTED_INT(ammo_satchel)
+	PREDICTED_INT(ammo_tripmine)
+	PREDICTED_INT(ammo_snark)
+	PREDICTED_INT(ammo_hornet)
 
-	PREDICTED_INT(ammo_m203_grenade);
-	PREDICTED_INT(ammo_shotgun_state);
-	PREDICTED_INT(ammo_gauss_state);
-	PREDICTED_INT(ammo_gauss_volume);
-	PREDICTED_INT(ammo_egon_state);
-	PREDICTED_INT(ammo_rpg_state);
-	PREDICTED_INT(mode_tempstate);
-	PREDICTED_INT(ammo_chainsaw_state);
-	PREDICTED_INT(ammo_hammer_state);
+	PREDICTED_INT(ammo_m203_grenade)
+	PREDICTED_INT(ammo_shotgun_state)
+	PREDICTED_INT(ammo_gauss_state)
+	PREDICTED_INT(ammo_gauss_volume)
+	PREDICTED_INT(ammo_egon_state)
+	PREDICTED_INT(ammo_rpg_state)
+	PREDICTED_INT(mode_tempstate)
+	PREDICTED_INT(ammo_chainsaw_state)
+	PREDICTED_INT(ammo_hammer_state)
 
-	PREDICTED_FLOAT(anim_top);
-	PREDICTED_FLOAT(anim_top_time);
-	PREDICTED_FLOAT(anim_top_delay);
-	PREDICTED_FLOAT(anim_bottom);
-	PREDICTED_FLOAT(anim_bottom_time);
+	PREDICTED_FLOAT(anim_top)
+	PREDICTED_FLOAT(anim_top_time)
+	PREDICTED_FLOAT(anim_top_delay)
+	PREDICTED_FLOAT(anim_bottom)
+	PREDICTED_FLOAT(anim_bottom_time)
 
 #ifdef CLIENT
-	virtual void(void) draw;
-	virtual float() predraw;
-	virtual void(void) postdraw;
 	virtual void(float,float) ReceiveEntity;
 	virtual void(void) PredictPreFrame;
 	virtual void(void) PredictPostFrame;