Counter-Strike: Precache item pickup sound shaders in advance, also

add sound shader for weapon.pickup

src/client/scihunt/init.c

@@ -41,12 +41,6 @@ Game_RendererRestarted(string rstr)
 	FX_Spark_Init();
 	FX_Impact_Init();
 
-	precache_model("sprites/640hud1.spr");
-	precache_model("sprites/640hud2.spr");
-	precache_model("sprites/640hud3.spr");
-	precache_model("sprites/640hud4.spr");
-	precache_model("sprites/640hud5.spr");
-	precache_model("sprites/640hud6.spr");
 	precache_model("sprites/chainsaw.spr");
 	precache_model("sprites/hammer.spr");
 	precache_model("sprites/w_cannon.spr");

src/server/cstrike/server.c

@@ -42,6 +42,12 @@ void Game_Worldspawn(void)
 	Sound_Precache("buy.weapon");
 	Sound_Precache("buy.ammo");
 
+	/* some Counter-Strike maps do not have weapon pickups, so we want to
+	 * precache these regardless in case of someone dropping a weapon,
+	 * which happens quite often (buying weapons, etc.) */
+	Sound_Precache("item.respawn");
+	Sound_Precache("weapon.pickup");
+
 	Weapons_Init();
 
 	clientstat(STAT_MONEY, EV_INTEGER, player::money);

src/server/valve/items.cpp

@@ -39,7 +39,7 @@ void item_pickup::touch(void)
 	}
 
 	Logging_Pickup(other, this, __NULL__);
-	sound(other, CHAN_ITEM, "items/gunpickup2.wav", 1, ATTN_NORM);
+	Sound_Play(other, CHAN_ITEM, "weapon.pickup");
 
 	CBaseTrigger::UseTargets();
 
@@ -71,12 +71,12 @@ void item_pickup::Respawn(void)
 	}
 
 	SetSize([-16,-16,0], [16,16,16]);
-	
+
 	think = __NULL__;
 	nextthink = -1;
 
-	if (!m_iWasDropped) {
+	if (!m_iWasDropped || cvar("sv_playerslots") > 1) {
-		sound(this, CHAN_ITEM, "items/suitchargeok1.wav", 1, ATTN_NORM, 150);
+		Sound_Play(this, CHAN_ITEM, "item.respawn");
 		m_iClip = -1;
 	}
 
@@ -85,7 +85,8 @@ void item_pickup::Respawn(void)
 
 void item_pickup::item_pickup(void)
 {
-	precache_sound("items/suitchargeok1.wav");
+	Sound_Precache("item.respawn");
+	Sound_Precache("weapon.pickup");
 	CBaseTrigger::CBaseTrigger();
 	Respawn();
 }

valve/data.pk3dir/sound/items_valve.sndshd

@@ -22,3 +22,8 @@ item.respawn
 {
 	sample items/suitchargeok1.wav
 }
+
+weapon.pickup
+{
+	sample items/gunpickup2.wav
+}