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 2e854b65d2d9a48d327da3d5237de727f4720b9c..66c34c4bbb4f5536ea099c21ff7615ea45c2833b 100644 (file)
--- 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)\r
                                if(clienttype(cl) == CLIENTTYPE_REAL)\r
                                {\r
-                                       play2(cl, "weapons/unavailable.wav");\r
+                                       play2(cl, "misc/unavailable.wav");\r
                                        sprint(cl, strcat("You don't have any ammo for the ^2", W_Name(wpn), "\n"));\r
                                }\r
                                return FALSE;\r
@@ -935,7 +935,7 @@ float client_hasweapon(entity cl, float wpn, float andammo, float complain)
                else\r
                        sprint(cl, strcat("The ^2", W_Name(wpn), "^7 is ^1NOT AVAILABLE^7 in this map\n") );\r
 \r
-               play2(cl, "weapons/unavailable.wav");\r
+               play2(cl, "misc/unavailable.wav");\r
        }\r
        return FALSE;\r
 };\r

diff --git a/data/qcsrc/server/miscfunctions.qc b/data/qcsrc/server/miscfunctions.qc
index a66b274b4a43feeae35ab9b5095aca209e833aa0..561631e5e5f05de4b69c31dbcef86969fd32b000 100644 (file)
--- a/data/qcsrc/server/miscfunctions.qc
+++ b/data/qcsrc/server/miscfunctions.qc
@@ -1408,6 +1408,7 @@ void precache()
     precache_sound ("misc/gib_splat04.wav");\r
     precache_sound ("misc/hit.wav");\r
        precache_sound ("misc/typehit.wav");\r
+       precache_sound ("misc/unavailable.wav");\r
     PrecacheGlobalSound((globalsound_fall = "misc/hitground 4"));\r
     PrecacheGlobalSound((globalsound_metalfall = "misc/metalhitground 4"));\r
     precache_sound ("misc/null.wav");\r
@@ -1437,7 +1438,6 @@ void precache()
     // common weapon precaches\r
     precache_sound ("weapons/weapon_switch.wav");\r
     precache_sound ("weapons/weaponpickup.wav");\r
-    precache_sound ("weapons/unavailable.wav");\r
     precache_sound ("weapons/grabber_fire.wav"); // grabber\r
        precache_sound ("weapons/grabber_altfire.wav"); // grabber\r
     precache_sound ("weapons/grabber_impact.wav"); // grabber\r

diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index 19fcb2b211c5dad474e16152b7f14afe479be0d3..607b66504bfcb955e625b7430202e62ff9d6655d 100644 (file)
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -36,7 +36,7 @@ float Swallow_condition_check(entity prey)
                {\r
                        if(time > self.complain_vore)\r
                        {\r
-                               play2(self, "weapons/unavailable.wav");\r
+                               play2(self, "misc/unavailable.wav");\r
                                sprint(self, "You cannot swallow your team mates\n");\r
                                self.complain_vore = time + complain_delay_time;\r
                        }\r
@@ -47,7 +47,7 @@ float Swallow_condition_check(entity prey)
                {\r
                        if(time > self.complain_vore)\r
                        {\r
-                               play2(self, "weapons/unavailable.wav");\r
+                               play2(self, "misc/unavailable.wav");\r
                                sprint(self, strcat("You cannot swallow more than ^2", cvar_string("g_balance_vore_swallow_limit"), "^7 players at a time\n"));\r
                                self.complain_vore = time + complain_delay_time;\r
                        }\r
@@ -59,7 +59,7 @@ float Swallow_condition_check(entity prey)
                {\r
                        if(time > self.complain_vore)\r
                        {\r
-                               play2(self, "weapons/unavailable.wav");\r
+                               play2(self, "misc/unavailable.wav");\r
                                sprint(self, "You cannot swallow someone with a bigger stomach than yours\n");\r
                                self.complain_vore = time + complain_delay_time;\r
                        }\r
@@ -309,7 +309,7 @@ void Vore_StomachLeave()
                Vore_Regurgitate(self);\r
        else if(time > self.complain_vore)\r
        {\r
-               play2(self, "weapons/unavailable.wav");\r
+               play2(self, "misc/unavailable.wav");\r
                sprint(self, strcat("You cannot get out of ", self.predator.netname, "\n"));\r
                self.complain_vore = time + complain_delay_time;\r
        }\r
@@ -394,7 +394,7 @@ void Vore()
                }\r
                else if(time > self.complain_vore)\r
                {\r
-                       play2(self, "weapons/unavailable.wav");\r
+                       play2(self, "misc/unavailable.wav");\r
                        sprint(self, "There is nothing to digest\n");\r
                        self.complain_vore = time + complain_delay_time;\r
                }\r
@@ -416,7 +416,7 @@ void Vore()
                }\r
                else if(time > self.complain_vore)\r
                {\r
-                       play2(self, "weapons/unavailable.wav");\r
+                       play2(self, "misc/unavailable.wav");\r
                        sprint(self, "There is nothing to regurgitate\n");\r
                        self.complain_vore = time + complain_delay_time;\r
                }\r

diff --git a/data/sound/misc/unavailable.wav b/data/sound/misc/unavailable.wav
new file mode 100644 (file)
index 0000000..b75c8c5
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 (file)
index b75c8c5..0000000
Binary files a/data/sound/weapons/unavailable.wav and /dev/null differ