From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Thu, 9 Sep 2010 22:46:01 +0000 (+0300)
Subject: Move this sound to misc, now that it addresses more than just weapons
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=48a70eb8c48686bce061a1717936824a04acb16a;p=voretournament%2Fvoretournament.git

Move this sound to misc, now that it addresses more than just weapons
---

diff --git a/data/qcsrc/server/cl_weaponsystem.qc b/data/qcsrc/server/cl_weaponsystem.qc
index 2e854b65..66c34c4b 100644
--- a/data/qcsrc/server/cl_weaponsystem.qc
+++ b/data/qcsrc/server/cl_weaponsystem.qc
@@ -891,7 +891,7 @@ float client_hasweapon(entity cl, float wpn, float andammo, float complain)
 				if (complain)
 				if(clienttype(cl) == CLIENTTYPE_REAL)
 				{
-					play2(cl, "weapons/unavailable.wav");
+					play2(cl, "misc/unavailable.wav");
 					sprint(cl, strcat("You don't have any ammo for the ^2", W_Name(wpn), "\n"));
 				}
 				return FALSE;
@@ -935,7 +935,7 @@ float client_hasweapon(entity cl, float wpn, float andammo, float complain)
 		else
 			sprint(cl, strcat("The ^2", W_Name(wpn), "^7 is ^1NOT AVAILABLE^7 in this map\n") );
 
-		play2(cl, "weapons/unavailable.wav");
+		play2(cl, "misc/unavailable.wav");
 	}
 	return FALSE;
 };
diff --git a/data/qcsrc/server/miscfunctions.qc b/data/qcsrc/server/miscfunctions.qc
index a66b274b..561631e5 100644
--- a/data/qcsrc/server/miscfunctions.qc
+++ b/data/qcsrc/server/miscfunctions.qc
@@ -1408,6 +1408,7 @@ void precache()
     precache_sound ("misc/gib_splat04.wav");
     precache_sound ("misc/hit.wav");
 	precache_sound ("misc/typehit.wav");
+	precache_sound ("misc/unavailable.wav");
     PrecacheGlobalSound((globalsound_fall = "misc/hitground 4"));
     PrecacheGlobalSound((globalsound_metalfall = "misc/metalhitground 4"));
     precache_sound ("misc/null.wav");
@@ -1437,7 +1438,6 @@ void precache()
     // common weapon precaches
     precache_sound ("weapons/weapon_switch.wav");
     precache_sound ("weapons/weaponpickup.wav");
-    precache_sound ("weapons/unavailable.wav");
     precache_sound ("weapons/grabber_fire.wav"); // grabber
 	precache_sound ("weapons/grabber_altfire.wav"); // grabber
     precache_sound ("weapons/grabber_impact.wav"); // grabber
diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index 19fcb2b2..607b6650 100644
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -36,7 +36,7 @@ float Swallow_condition_check(entity prey)
 		{
 			if(time > self.complain_vore)
 			{
-				play2(self, "weapons/unavailable.wav");
+				play2(self, "misc/unavailable.wav");
 				sprint(self, "You cannot swallow your team mates\n");
 				self.complain_vore = time + complain_delay_time;
 			}
@@ -47,7 +47,7 @@ float Swallow_condition_check(entity prey)
 		{
 			if(time > self.complain_vore)
 			{
-				play2(self, "weapons/unavailable.wav");
+				play2(self, "misc/unavailable.wav");
 				sprint(self, strcat("You cannot swallow more than ^2", cvar_string("g_balance_vore_swallow_limit"), "^7 players at a time\n"));
 				self.complain_vore = time + complain_delay_time;
 			}
@@ -59,7 +59,7 @@ float Swallow_condition_check(entity prey)
 		{
 			if(time > self.complain_vore)
 			{
-				play2(self, "weapons/unavailable.wav");
+				play2(self, "misc/unavailable.wav");
 				sprint(self, "You cannot swallow someone with a bigger stomach than yours\n");
 				self.complain_vore = time + complain_delay_time;
 			}
@@ -309,7 +309,7 @@ void Vore_StomachLeave()
 		Vore_Regurgitate(self);
 	else if(time > self.complain_vore)
 	{
-		play2(self, "weapons/unavailable.wav");
+		play2(self, "misc/unavailable.wav");
 		sprint(self, strcat("You cannot get out of ", self.predator.netname, "\n"));
 		self.complain_vore = time + complain_delay_time;
 	}
@@ -394,7 +394,7 @@ void Vore()
 		}
 		else if(time > self.complain_vore)
 		{
-			play2(self, "weapons/unavailable.wav");
+			play2(self, "misc/unavailable.wav");
 			sprint(self, "There is nothing to digest\n");
 			self.complain_vore = time + complain_delay_time;
 		}
@@ -416,7 +416,7 @@ void Vore()
 		}
 		else if(time > self.complain_vore)
 		{
-			play2(self, "weapons/unavailable.wav");
+			play2(self, "misc/unavailable.wav");
 			sprint(self, "There is nothing to regurgitate\n");
 			self.complain_vore = time + complain_delay_time;
 		}
diff --git a/data/sound/misc/unavailable.wav b/data/sound/misc/unavailable.wav
new file mode 100644
index 00000000..b75c8c57
Binary files /dev/null and b/data/sound/misc/unavailable.wav differ
diff --git a/data/sound/weapons/unavailable.wav b/data/sound/weapons/unavailable.wav
deleted file mode 100644
index b75c8c57..00000000
Binary files a/data/sound/weapons/unavailable.wav and /dev/null differ