From 5487e1438485f9c7ce95387b74924a40bf0a78d0 Mon Sep 17 00:00:00 2001
From: Steam Deck User <motolegacy.git@gmail.com>
Date: Wed, 29 Mar 2023 00:11:51 -0400
Subject: [PATCH] SERVER: Clear some unneccessary precaches

---
 source/server/entities/machines.qc |  5 ++++-
 source/server/main.qc              | 17 +++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/source/server/entities/machines.qc b/source/server/entities/machines.qc
index 9c63ef5..b11da8f 100644
--- a/source/server/entities/machines.qc
+++ b/source/server/entities/machines.qc
@@ -426,6 +426,8 @@ void() setup_perk =
 // Quick Revive
 void() perk_revive =
 {
+	precache_sound ("sounds/pu/byebye.wav");
+
 	//
 	// Set Default Stats for Compatibility
 	//
@@ -1445,6 +1447,7 @@ void() Create_Floating_Weapon =
 void() mystery_box_tp_spot = 
 {
 	precache_model ("models/props/teddy.mdl"); 
+	precache_sound ("sounds/pu/byebye.wav");
 	
 	self.solid=SOLID_TRIGGER;
 	self.classname = "mystery_box_tp_spot";
@@ -1912,7 +1915,7 @@ void() perk_pap =
 	precache_model ("models/machines/quake_scale/pap.mdl");
 	precache_model ("models/machines/v_pap.mdl");
 	precache_sound ("sounds/machines/papsound.wav");
-	precache_sound ("sounds/machines/papsound.wav");
+	precache_sound("sounds/weapons/papfire.wav");
 	setorigin(self, self.origin);
 	setmodel (self, "models/machines/quake_scale/pap.mdl");
 	setsize (self, VEC_HULL2_MIN, VEC_HULL2_MAX);
diff --git a/source/server/main.qc b/source/server/main.qc
index 99e6769..d19f208 100644
--- a/source/server/main.qc
+++ b/source/server/main.qc
@@ -134,9 +134,8 @@ void() precaches =
 	//
 
 	// sprites
-	precache_model ("models/sprites/revive.spr");
-	precache_model ("models/sprites/revive_white.spr");
 	precache_model ("models/sprites/sprkle.spr");
+	precache_model ("models/sprites/explosion.spr");
 	precache_model ("models/sprites/lightning.spr");
 	precache_model ("models/sprites/null.spr");
 	precache_model ("models/way/current_way.spr");
@@ -162,20 +161,20 @@ void() precaches =
 	precache_model ("models/ai/zarc(.mdl");
 	precache_model ("models/ai/zhc^.mdl");
 
-	// powerups
-	precache_model ("models/sprites/explosion.spr");
-	precache_model ("models/pu/perkbottle!.mdl");
-
 	// start weapons
 	precache_model ("models/weapons/m1911/v_colt.mdl");
 	precache_model ("models/weapons/m1911/g_colt.mdl");
 	precache_model ("models/weapons/knife/v_knife.mdl");
 	precache_model ("models/weapons/grenade/v_grenade.mdl");
 	precache_model ("models/weapons/grenade/g_grenade.mdl");
-	precache_model ("models/weapons/grenade/g_betty.mdl");
-	precache_model ("models/weapons/grenade/v_betty.mdl");
+
+#ifdef FTE
+
+	// FTE only has co-op, so don't precache morphine elsewhere.
 	precache_model ("models/weapons/morphine/v_morphine.mdl");
 
+#endif // FTE
+
 	//
 	// Sounds
 	//
@@ -201,7 +200,6 @@ void() precaches =
 	precache_sound("sounds/weapons/colt/magout.wav");
 	precache_sound("sounds/weapons/colt/shoot.wav");
 	precache_sound("sounds/weapons/colt/slide.wav");
-	precache_sound("sounds/weapons/papfire.wav");
 
 	// grenade
 	precache_sound("sounds/weapons/grenade/prime.wav");
@@ -227,7 +225,6 @@ void() precaches =
 
 	// power-ups
 	precache_sound ("sounds/pu/pickup.wav");
-	precache_sound ("sounds/pu/byebye.wav");
 	precache_sound ("sounds/pu/powerup.wav");
 	precache_sound ("sounds/pu/drop.wav");