From eb3eb567cadca6ef30605a476fa66270ab272e14 Mon Sep 17 00:00:00 2001
From: Marco Hladik <marco@icculus.org>
Date: Tue, 1 Feb 2022 09:33:28 -0800
Subject: [PATCH] Shared: nil out the base_client predraw. Get rid of the
 .pitch attribute of base_player. Fix some angle networking typos.

---
 src/shared/client.h  | 5 +++++
 src/shared/client.qc | 8 ++++++++
 src/shared/player.h  | 1 -
 src/shared/player.qc | 8 ++++----
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/shared/client.h b/src/shared/client.h
index f55b2cb2..eee2e2d6 100644
--- a/src/shared/client.h
+++ b/src/shared/client.h
@@ -4,5 +4,10 @@ class
 base_client:NSSurfacePropEntity
 {
 	void(void) base_client;
+
 	virtual void(void) ClientInputFrame;
+
+#ifdef CLIENT
+	virtual float(void) predraw;
+#endif
 };
diff --git a/src/shared/client.qc b/src/shared/client.qc
index c8480b9b..f12794e9 100644
--- a/src/shared/client.qc
+++ b/src/shared/client.qc
@@ -4,6 +4,14 @@ base_client::ClientInputFrame(void)
 
 }
 
+#ifdef CLIENT
+float
+base_client::predraw(void)
+{
+	return (PREDRAW_NEXT);
+}
+#endif
+
 void
 base_client::base_client(void)
 {
diff --git a/src/shared/player.h b/src/shared/player.h
index 03b90a52..1ddc2088 100644
--- a/src/shared/player.h
+++ b/src/shared/player.h
@@ -86,7 +86,6 @@ base_player:base_client
 
 #ifdef CLIENT
 	int sequence;
-	float pitch;
 
 	virtual void(float, float) ReceiveEntity;
 	virtual void(void) PredictPreFrame;
diff --git a/src/shared/player.qc b/src/shared/player.qc
index 77b82408..6c7c1da8 100644
--- a/src/shared/player.qc
+++ b/src/shared/player.qc
@@ -114,14 +114,14 @@ base_player::ReceiveEntity(float new, float fl)
 	if (fl & PLAYER_ORIGIN_Z)
 		origin[2] = readcoord();
 	if (fl & PLAYER_ANGLES_X) {
-		v_angle[0] = pitch = readshort() / (32767 / 360);
-		v_angle[1] = pitch = readshort() / (32767 / 360);
-		v_angle[2] = pitch = readshort() / (32767 / 360);
+		v_angle[0] = readshort() / (32767 / 360);
+		v_angle[1] = readshort() / (32767 / 360);
+		v_angle[2] = readshort() / (32767 / 360);
 	}
 	if (fl & PLAYER_ANGLES_Y) {
 		angles[0] = readshort() / (32767 / 360);
 		angles[1] = readshort() / (32767 / 360);
-		angles[1] = readshort() / (32767 / 360);
+		angles[2] = readshort() / (32767 / 360);
 	}
 	if (fl & PLAYER_COLORMAP)
 		colormap = readbyte();