From c314e880fd5de34a91a6a6ecccbb74dfaafedecc Mon Sep 17 00:00:00 2001
From: Marco Cawthorne <marco@vera-visions.com>
Date: Wed, 20 Sep 2023 15:40:13 -0700
Subject: [PATCH] Client: Fix the parameter order on a few classes'
 ReceiveEntity methods

---
 src/gs-entbase/shared/env_fog_controller.qc     |  2 +-
 src/gs-entbase/shared/func_tankmortar.qc        |  2 +-
 src/gs-entbase/shared/func_vehicle.qc           |  2 +-
 src/gs-entbase/shared/prop_rope.qc              |  2 +-
 src/gs-entbase/shared/prop_vehicle_driveable.qc |  2 +-
 src/shared/NSVehicle.h                          |  4 ----
 src/shared/NSVehicle.qc                         | 16 +---------------
 7 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/src/gs-entbase/shared/env_fog_controller.qc b/src/gs-entbase/shared/env_fog_controller.qc
index b383213e..d1137c89 100644
--- a/src/gs-entbase/shared/env_fog_controller.qc
+++ b/src/gs-entbase/shared/env_fog_controller.qc
@@ -204,7 +204,7 @@ env_fog_controller::RendererRestarted(void)
 }
 
 void
-env_fog_controller::ReceiveEntity(float flSendFlags, float flNew)
+env_fog_controller::ReceiveEntity(float flNew, float flSendFlags)
 {
 	if (flSendFlags & ENVFOGCTRL_CHANGED_ACTIVE)
 		m_iFogActive = readbyte();
diff --git a/src/gs-entbase/shared/func_tankmortar.qc b/src/gs-entbase/shared/func_tankmortar.qc
index 817b7541..474c3343 100644
--- a/src/gs-entbase/shared/func_tankmortar.qc
+++ b/src/gs-entbase/shared/func_tankmortar.qc
@@ -127,7 +127,7 @@ func_tankmortar::PredictPostFrame(void)
 }
 
 void
-func_tankmortar::ReceiveEntity(float fChanged, float new)
+func_tankmortar::ReceiveEntity(float new, float fChanged)
 {
 	if (fChanged & VEHFL_CHANGED_ORIGIN) {
 		origin[0] = readcoord();
diff --git a/src/gs-entbase/shared/func_vehicle.qc b/src/gs-entbase/shared/func_vehicle.qc
index 868ae1c4..91140657 100644
--- a/src/gs-entbase/shared/func_vehicle.qc
+++ b/src/gs-entbase/shared/func_vehicle.qc
@@ -882,7 +882,7 @@ func_vehicle::RunVehiclePhysics(void)
 
 #ifdef CLIENT
 void
-func_vehicle::ReceiveEntity(float flChanged, float flNew)
+func_vehicle::ReceiveEntity(float flNew, float flChanged)
 {
 	if (flChanged & FNCVEHNET_DRIVER) {
 		driver_entnum = readentitynum();
diff --git a/src/gs-entbase/shared/prop_rope.qc b/src/gs-entbase/shared/prop_rope.qc
index 006e5609..1a90ceb1 100644
--- a/src/gs-entbase/shared/prop_rope.qc
+++ b/src/gs-entbase/shared/prop_rope.qc
@@ -167,7 +167,7 @@ prop_rope::predraw(void)
 }
 
 void
-prop_rope::ReceiveEntity(float flSendFlags, float new)
+prop_rope::ReceiveEntity(float new, float flSendFlags)
 {
 	if (flSendFlags & PROPROPE_CHANGED_MAT)
 		m_strShader = readstring();
diff --git a/src/gs-entbase/shared/prop_vehicle_driveable.qc b/src/gs-entbase/shared/prop_vehicle_driveable.qc
index bf9e95f3..03d4cfee 100644
--- a/src/gs-entbase/shared/prop_vehicle_driveable.qc
+++ b/src/gs-entbase/shared/prop_vehicle_driveable.qc
@@ -738,7 +738,7 @@ prop_vehicle_driveable::Respawn(void)
 
 #ifdef CLIENT
 void
-prop_vehicle_driveable::ReceiveEntity(float flSendFlags, float flNew)
+prop_vehicle_driveable::ReceiveEntity(float flNew, float flSendFlags)
 {
 	if (flSendFlags & VEHFL_DRIVER) {
 		driver_entnum = readentitynum();
diff --git a/src/shared/NSVehicle.h b/src/shared/NSVehicle.h
index b56cb540..d02de11e 100644
--- a/src/shared/NSVehicle.h
+++ b/src/shared/NSVehicle.h
@@ -89,7 +89,3 @@ enumflags
 	VHF_FROZEN,
 	VHF_NOATTACK
 };
-
-#ifdef CLIENT
-void basevehicle_readentity(float isnew);
-#endif
diff --git a/src/shared/NSVehicle.qc b/src/shared/NSVehicle.qc
index 1bcf396b..088bfbd2 100644
--- a/src/shared/NSVehicle.qc
+++ b/src/shared/NSVehicle.qc
@@ -173,7 +173,7 @@ NSVehicle::PredictPostFrame(void)
 }
 
 void
-NSVehicle::ReceiveEntity(float fChanged, float new)
+NSVehicle::ReceiveEntity(float new, float fChanged)
 {
 	if (fChanged & VEHFL_CHANGED_ORIGIN) {
 		origin[0] = readcoord();
@@ -470,17 +470,3 @@ NSVehicle::PlayerLeave(NSClientPlayer pl)
 
 	SetSendFlags(VEHFL_CHANGED_DRIVER);
 }
-
-#ifdef CLIENT
-void
-basevehicle_readentity(float isnew)
-{
-	NSVehicle veh = (NSVehicle)self;
-	float flags = readfloat();
-
-	if (isnew)
-		spawnfunc_NSVehicle();
-
-	veh.ReceiveEntity(flags, isnew);
-}
-#endif