From 95bd976b58438bf8cc81767d77745e3a03426e56 Mon Sep 17 00:00:00 2001
From: Marco Hladik <marco@icculus.org>
Date: Wed, 11 May 2022 12:50:59 -0700
Subject: [PATCH] Adjust naming against upstream.

---
 src/server/gamerules.h  | 10 +++++-----
 src/server/gamerules.qc | 10 +++++-----
 src/shared/player.qc    | 12 ++++++------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/server/gamerules.h b/src/server/gamerules.h
index d26b831..dc05847 100644
--- a/src/server/gamerules.h
+++ b/src/server/gamerules.h
@@ -18,11 +18,11 @@ class TFCGameRules:CGameRules
 {
 	void(void) TFCGameRules;
 
-	virtual void(base_player) PlayerConnect;
-	virtual void(base_player) PlayerDisconnect;
-	virtual void(base_player) PlayerPostFrame;
-	virtual void(base_player) PlayerSpawn;
-	virtual void(base_player) PlayerKill;
+	virtual void(NSClientPlayer) PlayerConnect;
+	virtual void(NSClientPlayer) PlayerDisconnect;
+	virtual void(NSClientPlayer) PlayerPostFrame;
+	virtual void(NSClientPlayer) PlayerSpawn;
+	virtual void(NSClientPlayer) PlayerKill;
 
 	virtual void(void) LevelNewParms;
 };
diff --git a/src/server/gamerules.qc b/src/server/gamerules.qc
index 2da9a1b..66113d7 100644
--- a/src/server/gamerules.qc
+++ b/src/server/gamerules.qc
@@ -19,7 +19,7 @@ var int autocvar_sv_playerkeepalive = TRUE;
 /* we check what fields have changed over the course of the frame and network
  * only the ones that have actually changed */
 void
-TFCGameRules::PlayerPostFrame(base_player pp)
+TFCGameRules::PlayerPostFrame(NSClientPlayer pp)
 {
 }
 
@@ -35,14 +35,14 @@ TFCGameRules::LevelNewParms(void)
 }
 
 void
-TFCGameRules::PlayerConnect(base_player pl)
+TFCGameRules::PlayerConnect(NSClientPlayer pl)
 {
 	if (Plugin_PlayerConnect(pl) == FALSE)
 		bprint(PRINT_HIGH, sprintf("%s connected\n", pl.netname));
 }
 
 void
-TFCGameRules::PlayerDisconnect(base_player pl)
+TFCGameRules::PlayerDisconnect(NSClientPlayer pl)
 {
 	bprint(PRINT_HIGH, sprintf("%s disconnected\n", pl.netname));
 
@@ -56,14 +56,14 @@ TFCGameRules::PlayerDisconnect(base_player pl)
 }
 
 void
-TFCGameRules::PlayerKill(base_player pp)
+TFCGameRules::PlayerKill(NSClientPlayer pp)
 {
 	player pl = (player)pp;
 	Damage_Apply(pl, pl, pl.health, WEAPON_NONE, DMG_SKIP_ARMOR);
 }
 
 void
-TFCGameRules::PlayerSpawn(base_player pp)
+TFCGameRules::PlayerSpawn(NSClientPlayer pp)
 {
 	player pl = (player)pp;
 	pl.classname = "unspawned";
diff --git a/src/shared/player.qc b/src/shared/player.qc
index febc68c..1fd261d 100644
--- a/src/shared/player.qc
+++ b/src/shared/player.qc
@@ -42,7 +42,7 @@ enumflags
 	PLAYER_UNUSED2
 };
 
-class player:base_player
+class player:NSClientPlayer
 {
 	/* animation */
 	PREDICTED_INT(anim_top);
@@ -103,7 +103,7 @@ void
 player::ReceiveEntity(float new, float fl)
 {
 	/* the generic client attributes */
-	base_player::ReceiveEntity(new, fl);
+	NSClientPlayer::ReceiveEntity(new, fl);
 
 	/* animation */
 	if (fl & PLAYER_TOPFRAME) {
@@ -167,7 +167,7 @@ void
 player::PredictPreFrame(void)
 {
 	/* the generic client attributes */
-	base_player::PredictPreFrame();
+	NSClientPlayer::PredictPreFrame();
 
 	SAVE_STATE(anim_top);
 	SAVE_STATE(anim_top_delay);
@@ -200,7 +200,7 @@ void
 player::PredictPostFrame(void)
 {
 	/* the generic client attributes */
-	base_player::PredictPostFrame();
+	NSClientPlayer::PredictPostFrame();
 
 	ROLL_BACK(anim_top);
 	ROLL_BACK(anim_top_delay);
@@ -227,7 +227,7 @@ void
 player::EvaluateEntity(void)
 {
 	/* the generic client attributes */
-	base_player::EvaluateEntity();
+	NSClientPlayer::EvaluateEntity();
 
 	/* animation */
 	if (ATTR_CHANGED(anim_bottom) || ATTR_CHANGED(anim_bottom_time))
@@ -309,7 +309,7 @@ player::SendEntity(entity ePEnt, float fChanged)
 	WriteFloat(MSG_ENTITY, fChanged);
 
 	/* the generic client attributes */
-	base_player::SendEntity(ePEnt, fChanged);
+	NSClientPlayer::SendEntity(ePEnt, fChanged);
 
 	if (fChanged & PLAYER_TOPFRAME) {
 		WriteByte(MSG_ENTITY, anim_top);