The unavailable.wav sound is only located in misc/, not weapons/ (as it addresses...

[voretournament/voretournament.git] / data / qcsrc / server / miscfunctions.qc

diff --git a/data/qcsrc/server/miscfunctions.qc b/data/qcsrc/server/miscfunctions.qc
index 766b57c6bc11278f4f137374e1e1b7bfdc608659..bf8aaedf878a837fe1b4b525e6051cc103033cb3 100644 (file)
--- a/data/qcsrc/server/miscfunctions.qc
+++ b/data/qcsrc/server/miscfunctions.qc
@@ -617,6 +617,9 @@ void GetCvars(float f)
        GetCvars_handleFloat(s, f, cvar_chase_active, "chase_active");\r
        GetCvars_handleFloat(s, f, cvar_cl_vore_stomachmodel, "cl_vore_stomachmodel");\r
        GetCvars_handleFloat(s, f, cvar_cl_vore_cameraspeed, "cl_vore_cameraspeed");\r
+       GetCvars_handleFloat(s, f, cvar_cl_vore_punchangle, "cl_vore_punchangle");\r
+       GetCvars_handleFloat(s, f, cvar_cl_vore_kick_punchangle, "cl_vore_kick_punchangle");\r
+       GetCvars_handleFloat(s, f, cvar_cl_vore_autodigest, "cl_vore_autodigest");\r
 \r
        self.cvar_cl_accuracy_data_share = boolean(self.cvar_cl_accuracy_data_share);\r
        self.cvar_cl_accuracy_data_receive = boolean(self.cvar_cl_accuracy_data_receive);\r
@@ -1262,8 +1265,11 @@ void stopsound(entity e, float chan)
 void play2(entity e, string filename)\r
 {\r
     //stuffcmd(e, strcat("play2 ", filename, "\n"));\r
-    msg_entity = e;\r
-    soundtoat(MSG_ONE, world, '0 0 0', CHAN_AUTO, filename, VOL_BASE, ATTN_NONE);\r
+    if (clienttype(e) == CLIENTTYPE_REAL)\r
+    {\r
+        msg_entity = e;\r
+        soundtoat(MSG_ONE, world, '0 0 0', CHAN_AUTO, filename, VOL_BASE, ATTN_NONE);\r
+    }\r
 }\r
 \r
 // use this one if you might be causing spam (e.g. from touch functions that might get called more than once per frame)\r
@@ -1404,6 +1410,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
@@ -1414,6 +1421,8 @@ void precache()
     precache_sound ("player/lava.wav");\r
     precache_sound ("player/slime.wav");\r
     precache_sound ("player/digest.wav");\r
+       precache_sound ("misc/health_regen.ogg");\r
+       precache_sound ("misc/armor_regen.ogg");\r
 \r
     if (g_jetpack)\r
         precache_sound ("misc/jetpack_fly.wav");\r
@@ -1433,7 +1442,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