From 9feedd1f04fe04ee6d5d38471aa38b6fa952a008 Mon Sep 17 00:00:00 2001
From: Marco Hladik <marco@icculus.org>
Date: Mon, 9 Sep 2019 18:57:46 +0200
Subject: [PATCH] Cleaned up some names used in prediction.

---
 src/client/predict.c          | 26 +++++++++++++-------------
 src/client/valve/view.c       |  2 +-
 src/shared/scihunt/player.cpp | 16 ++++++++--------
 src/shared/valve/player.cpp   | 15 ++++++++-------
 4 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/src/client/predict.c b/src/client/predict.c
index 33b9c055..9a18bec6 100644
--- a/src/client/predict.c
+++ b/src/client/predict.c
@@ -25,12 +25,12 @@ Propagate our pmove state to whatever the current frame before its stomped on
 */
 void Predict_PreFrame(player pl)
 {
-	pl.netorigin = pl.origin;
-	pl.netvelocity = pl.velocity;
-	pl.netflags = pl.flags;
-	pl.netjumptime = pl.jumptime;
-	pl.netteleport_time = pl.teleport_time;
-	pl.netviewzoom = pl.viewzoom;
+	pl.net_origin = pl.origin;
+	pl.net_velocity = pl.velocity;
+	pl.net_flags = pl.flags;
+	pl.net_jumptime = pl.jumptime;
+	pl.net_teleport_time = pl.teleport_time;
+	pl.net_viewzoom = pl.viewzoom;
 
 #ifdef VALVE
 	pl.net_w_attack_next = pl.w_attack_next;
@@ -76,13 +76,13 @@ Rewind our pmove state back to before we started predicting.
 */
 void Predict_PostFrame(player pl)
 {
-	pl.origin = pl.netorigin;
-	pl.velocity = pl.netvelocity;
-	pl.flags = pl.netflags;
-	pl.jumptime = pl.netjumptime;
-	pl.teleport_time = pl.netteleport_time;
-	pl.viewzoom = pl.netviewzoom;
-	
+	pl.origin = pl.net_origin;
+	pl.velocity = pl.net_velocity;
+	pl.flags = pl.net_flags;
+	pl.jumptime = pl.net_jumptime;
+	pl.teleport_time = pl.net_teleport_time;
+	pl.viewzoom = pl.net_viewzoom;
+
 #ifdef VALVE
 	pl.w_attack_next = pl.net_w_attack_next;
 	pl.w_idle_next = pl.net_w_idle_next;
diff --git a/src/client/valve/view.c b/src/client/valve/view.c
index 8546cd1a..272c26b3 100644
--- a/src/client/valve/view.c
+++ b/src/client/valve/view.c
@@ -38,7 +38,7 @@ View_UpdateWeapon(entity vm, entity mflash)
 	 * vile but it'll have to do for now */
 	pl.net_w_attack_next = pl.w_attack_next;
 	pl.net_w_idle_next = pl.w_idle_next;
-	pl.netviewzoom = pl.viewzoom;
+	pl.net_viewzoom = pl.viewzoom;
 	pl.net_weapontime = pl.weapontime;
 
 	/* figure out when the attachments start. in FTE attachments for
diff --git a/src/shared/scihunt/player.cpp b/src/shared/scihunt/player.cpp
index 4c942c06..09b24a3d 100644
--- a/src/shared/scihunt/player.cpp
+++ b/src/shared/scihunt/player.cpp
@@ -61,18 +61,18 @@ class player
 	float lastweapon;
 
 	/* Prediction */
-	vector netorigin;
-	vector netvelocity;
-	float netflags;
+	vector net_origin;
+	vector net_velocity;
+	float net_flags;
 	float net_w_attack_next;
 	float net_w_idle_next;
+	float net_jumptime;
+	float net_teleport_time;
 	float net_weapontime;
-	float netjumptime;
-	float netteleport_time;
-	float netviewzoom;
+	float net_viewzoom;
 	int net_ammo1;
-    int net_ammo2;
-    int net_ammo3;
+	int net_ammo2;
+	int net_ammo3;
 	int sequence;
 	
 	virtual void() gun_offset;
diff --git a/src/shared/valve/player.cpp b/src/shared/valve/player.cpp
index 16eeca0f..13c9e770 100644
--- a/src/shared/valve/player.cpp
+++ b/src/shared/valve/player.cpp
@@ -33,7 +33,8 @@ class player
 	int a_ammo3;
 
 	/* We can't use the default .items field, because FTE will assume
-	 * effects of some bits. Such as invisibility, quad, etc. */
+	 * effects of some bits. Such as invisibility, quad, etc. 
+	 * also, modders probably want 32 bits for items. */
 	int g_items; 
 
 	float activeweapon;
@@ -59,15 +60,15 @@ class player
 	float lastweapon;
 
 	/* Prediction */
-	vector netorigin;
-	vector netvelocity;
-	float netflags;
+	vector net_origin;
+	vector net_velocity;
+	float net_flags;
 	float net_w_attack_next;
 	float net_w_idle_next;
-	float netjumptime;
-	float netteleport_time;
+	float net_jumptime;
+	float net_teleport_time;
 	float net_weapontime;
-	float netviewzoom;
+	float net_viewzoom;
 	int net_ammo1;
 	int net_ammo2;
 	int net_ammo3;