From 2f9791b39ed8e096504c358381fe6e03c07459de Mon Sep 17 00:00:00 2001
From: Marco Cawthorne <marco@vera-visions.com>
Date: Wed, 28 Dec 2022 16:51:52 -0800
Subject: [PATCH] Get rid of obsolete routines, move the code handling
 buy/rescue/bomb zone triggers into the new RunClientCommand() player method.

---
 manifest.fmf         |  2 +-
 src/server/client.qc | 83 --------------------------------------------
 src/server/progs.src |  2 --
 src/shared/player.h  | 22 +++++++-----
 4 files changed, 15 insertions(+), 94 deletions(-)
 delete mode 100644 src/server/client.qc
 mode change 100755 => 100644 src/server/progs.src

diff --git a/manifest.fmf b/manifest.fmf
index 805d3f6..bde984f 100644
--- a/manifest.fmf
+++ b/manifest.fmf
@@ -7,7 +7,7 @@ BASEGAME cstrike
 
 // you don't really want to change these
 RTCBROKER master.frag-net.com:27950
-PROTOCOLNAME "FreeHL"
+PROTOCOLNAME "Nuclide"
 MAINCONFIG game.cfg
 DOWNLOADSURL "http://www.frag-net.com/dl/packages"
 
diff --git a/src/server/client.qc b/src/server/client.qc
deleted file mode 100644
index 70e8be6..0000000
--- a/src/server/client.qc
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (c) 2016-2020 Marco Cawthorne <marco@icculus.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER
- * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-void
-Game_RunClientCommand(void)
-{
-	player pl = (player)self;
-
-	pl.gflags &= ~GF_BUYZONE;
-	pl.gflags &= ~GF_RESCUEZONE;
-	pl.gflags &= ~GF_BOMBZONE;
-
-	pl.Physics_Run();
-}
-
-void
-SV_SendChat(entity sender, string msg, entity eEnt, float fType)
-{
-	WriteByte(MSG_MULTICAST, SVC_CGAMEPACKET);
-	WriteByte(MSG_MULTICAST, fType == 0 ? EV_CHAT:EV_CHAT_TEAM);
-	WriteByte(MSG_MULTICAST, num_for_edict(sender) - 1); 
-	WriteByte(MSG_MULTICAST, sender.team); 
-	WriteString(MSG_MULTICAST, msg);
-	if (eEnt) {
-		msg_entity = eEnt;
-		multicast([0,0,0], MULTICAST_ONE);
-	} else {
-		multicast([0,0,0], MULTICAST_ALL);
-	}
-
-	localcmd(sprintf("echo [SERVER] %s: %s\n", sender.netname, msg));
-}
-
-void
-Game_ParseClientCommand(string cmd)
-{
-	tokenize(cmd);
-
-	if (argv(1) == "timeleft") {
-		string msg;
-		string timestring;
-		float timeleft;
-		timeleft = cvar("mp_timelimit") - (time / 60);
-		timestring = Util_TimeToString(timeleft);
-		msg = sprintf("we have %s minutes remaining", timestring);
-		bprint(PRINT_CHAT, msg);
-		return;
-	}
-
-	if (argv(0) == "say") {
-		SV_SendChat(self, argv(1), world, 0);
-		return;
-	} else if (argv(0) == "say_team") {
-		entity a;
-		for (a = world; (a = find(a, ::classname, "player"));) { 
-			if (a.team == self.team) {
-				SV_SendChat(self, argv(1), a, 1);
-			}
-		}
-		return;
-	}
-
-	clientcommand(self, cmd);
-}
-
-void
-Game_SetNewParms(void)
-{
-
-}
diff --git a/src/server/progs.src b/src/server/progs.src
old mode 100755
new mode 100644
index 0d02f37..1370de1
--- a/src/server/progs.src
+++ b/src/server/progs.src
@@ -22,7 +22,6 @@ defs.h
 ../shared/include.src
 
 player.qc
-../../../valve/src/server/spectator.qc
 
 hostage_entity.qc
 armoury_entity.qc
@@ -46,7 +45,6 @@ gamerules_singleplayer.qc
 gamerules_multiplayer.qc
 
 radio.qc
-client.qc
 ammo.qc
 buy.qc
 server.qc
diff --git a/src/shared/player.h b/src/shared/player.h
index 4126c31..86ae2d6 100644
--- a/src/shared/player.h
+++ b/src/shared/player.h
@@ -177,16 +177,14 @@ class player:NSClientPlayer
 	int cs_cross_deltadist;
 	float cs_crosshairdistance;
 
-	//virtual void(void) draw;
-	//virtual float() predraw;
-	//virtual void(void) postdraw;
 	virtual void UpdatePlayerAttachments(bool);
-	virtual void(float, float) ReceiveEntity;
-	virtual void(void) PredictPreFrame;
-	virtual void(void) PredictPostFrame;
+	virtual void ReceiveEntity(float, float);
+	virtual void PredictPreFrame(void);
+	virtual void PredictPostFrame(void);
 #else
-	virtual void(void) EvaluateEntity;
-	virtual float(entity, float) SendEntity;
+	virtual void RunClientCommand(void);
+	virtual void EvaluateEntity(void);
+	virtual float SendEntity(entity, float);
 
 	int charmodel;
 	int money;
@@ -493,6 +491,14 @@ player::PredictPostFrame(void)
 }
 
 #else
+void
+player::RunClientCommand(void)
+{
+	gflags &= ~GF_BUYZONE;
+	gflags &= ~GF_RESCUEZONE;
+	gflags &= ~GF_BOMBZONE;
+}
+
 void
 player::EvaluateEntity(void)
 {