From 78096dc2a8a72b59eae244278c614a0e64cfe687 Mon Sep 17 00:00:00 2001
From: Marco Cawthorne <marco@vera-visions.com>
Date: Wed, 16 Oct 2024 23:09:17 -0700
Subject: [PATCH] Fix up code against latest RT.

---
 src/server/defs.h       |  2 --
 src/server/dispenser.qc |  2 +-
 src/server/gamerules.h  |  1 -
 src/server/gamerules.qc | 14 --------------
 src/server/progs.src    |  2 --
 src/server/sentry.qc    |  4 ++--
 src/server/server.qc    |  2 --
 7 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/src/server/defs.h b/src/server/defs.h
index c46b879..0ee34d8 100644
--- a/src/server/defs.h
+++ b/src/server/defs.h
@@ -16,8 +16,6 @@
 
 #include "gamerules.h"
 #include "../../../valve/src/shared/defs.h"
-#include "../../../valve/src/server/items.h"
-#include "../../../valve/src/server/flashlight.h"
 #include "sentry.h"
 
 var bool g_tfcHasBlueTeam = false;
diff --git a/src/server/dispenser.qc b/src/server/dispenser.qc
index 57b9de7..0a733ae 100644
--- a/src/server/dispenser.qc
+++ b/src/server/dispenser.qc
@@ -249,7 +249,7 @@ TFCDispenser::TFCDispenser(void)
 	SetMovetype(MOVETYPE_NONE);
 	SetSize([-16,-16,0], [16,16,48]);
 	SetHealth(150);
-	SetTakedamage(DAMAGE_YES);
+	MakeVulnerable();
 }
 
 void
diff --git a/src/server/gamerules.h b/src/server/gamerules.h
index 4d1fab9..50517d4 100644
--- a/src/server/gamerules.h
+++ b/src/server/gamerules.h
@@ -27,7 +27,6 @@ class TFCGameRules:CGameRules
 	virtual void PlayerSpawn(NSClientPlayer);
 	virtual void PlayerKill(NSClientPlayer);
 	virtual void PlayerRespawn(NSClientPlayer);
-	virtual void PlayerDeath(NSClientPlayer);
 	virtual void DropGoalItem(NSClientPlayer);
 	virtual float ImpulseCommand(NSClient, float);
 	virtual void LevelNewParms(void);
diff --git a/src/server/gamerules.qc b/src/server/gamerules.qc
index 49a4324..c44b364 100644
--- a/src/server/gamerules.qc
+++ b/src/server/gamerules.qc
@@ -122,20 +122,6 @@ TFCGameRules_PlayerRespawn(void)
 	rule.PlayerRespawn((NSClientPlayer)self);
 }
 
-void
-TFCGameRules::PlayerDeath(NSClientPlayer pp)
-{
-	TFPlayer pl = (TFPlayer)pp;
-
-	DropGoalItem(pp);
-	pl.SetSolid(SOLID_NOT);
-	pl.SetMovetype(MOVETYPE_NONE);
-
-	pl.ScheduleThink(TFCGameRules_PlayerRespawn, 4.0f);
-
-	/* play the iconic death sound */
-	Sound_Play(pl, CHAN_VOICE, "player_tfc.death");
-}
 
 void
 TFCGameRules::PlayerKill(NSClientPlayer pp)
diff --git a/src/server/progs.src b/src/server/progs.src
index f349d14..887664b 100644
--- a/src/server/progs.src
+++ b/src/server/progs.src
@@ -16,7 +16,6 @@
 ../../../src/gs-entbase/shared.src
 defs.h
 ../shared/include.src
-../../../valve/src/server/player.qc
 dispenser.qc
 sentry.qc
 teleporter.qc
@@ -36,7 +35,6 @@ nades.qc
 gamerules.qc
 client.qc
 server.qc
-../../../valve/src/server/flashlight.qc
 spawn.qc
 ../../../src/server/include.src
 ../../../src/shared/include.src
diff --git a/src/server/sentry.qc b/src/server/sentry.qc
index 18396bb..9a09226 100644
--- a/src/server/sentry.qc
+++ b/src/server/sentry.qc
@@ -124,10 +124,10 @@ TFCSentry::TFCSentry(void)
 	SetMovetype(MOVETYPE_NONE);
 	SetSize([-16,-16,0], [16,16,20]);
 
-	SetTakedamage(DAMAGE_YES);
 	SetHealth(100);
-	m_eHead.SetTakedamage(DAMAGE_YES);
+	MakeVulnerable();
 	m_eHead.SetHealth(100);
+	m_eHead.MakeVulnerable();
 	m_state = SENTRY_IDLE;
 }
 
diff --git a/src/server/server.qc b/src/server/server.qc
index c75708e..fec4708 100644
--- a/src/server/server.qc
+++ b/src/server/server.qc
@@ -42,8 +42,6 @@ Game_Worldspawn(void)
 	precache_model("models/sentry3.mdl");
 	precache_model("models/player.mdl");
 	precache_model("models/w_weaponbox.mdl");
-
-	Player_Precache();
 	FX_Corpse_Init();
 }