Added cl_sound_ric_gunshot which specifies if the related cl_sound_ric and cl_sound_t...

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@7206 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/cl_parse.c b/cl_parse.c
index bc497bcfe43ebbfb62280b899bd6bbaae340a70c..b08170fa4e18b1a7e6ac3587b912002c2c7067f5 100644 (file)
--- a/cl_parse.c
+++ b/cl_parse.c
@@ -164,6 +164,7 @@ cvar_t cl_sound_tink1 = {0, "cl_sound_tink1", "weapons/tink1.wav", "sound to pla
 cvar_t cl_sound_ric1 = {0, "cl_sound_ric1", "weapons/ric1.wav", "sound to play with 5% chance during TE_SPIKE/TE_SUPERSPIKE (empty cvar disables sound)"};
 cvar_t cl_sound_ric2 = {0, "cl_sound_ric2", "weapons/ric2.wav", "sound to play with 5% chance during TE_SPIKE/TE_SUPERSPIKE (empty cvar disables sound)"};
 cvar_t cl_sound_ric3 = {0, "cl_sound_ric3", "weapons/ric3.wav", "sound to play with 10% chance during TE_SPIKE/TE_SUPERSPIKE (empty cvar disables sound)"};
+cvar_t cl_sound_ric_gunshot = {0, "cl_sound_ric_gunshot", "0", "specifies if the related cl_sound_ric and cl_sound_tink sounds apply to TE_GUNSHOT/TE_GUNSHOTQUAD"};
 cvar_t cl_sound_r_exp3 = {0, "cl_sound_r_exp3", "weapons/r_exp3.wav", "sound to play during TE_EXPLOSION and related effects (empty cvar disables sound)"};
 cvar_t cl_serverextension_download = {0, "cl_serverextension_download", "0", "indicates whether the server supports the download command"};
 cvar_t cl_joinbeforedownloadsfinish = {CVAR_SAVE, "cl_joinbeforedownloadsfinish", "1", "if non-zero the game will begin after the map is loaded before other downloads finish"};
@@ -2086,6 +2087,21 @@ void CL_ParseTempEntity(void)
                        VectorSet(pos2, pos[0] + radius, pos[1] + radius, pos[2] + radius);
                        VectorSet(pos, pos[0] - radius, pos[1] - radius, pos[2] - radius);
                        CL_ParticleEffect(EFFECT_TE_GUNSHOT, radius, pos, pos2, vec3_origin, vec3_origin, NULL, 0);
+                       if(cl_sound_ric_gunshot.integer)
+                       {
+                               if (rand() % 5)
+                                       S_StartSound(-1, 0, cl.sfx_tink1, pos, 1, 1);
+                               else
+                               {
+                                       rnd = rand() & 3;
+                                       if (rnd == 1)
+                                               S_StartSound(-1, 0, cl.sfx_ric1, pos, 1, 1);
+                                       else if (rnd == 2)
+                                               S_StartSound(-1, 0, cl.sfx_ric2, pos, 1, 1);
+                                       else
+                                               S_StartSound(-1, 0, cl.sfx_ric3, pos, 1, 1);
+                               }
+                       }
                        break;
 
                case QW_TE_BLOOD:
@@ -2277,6 +2293,21 @@ void CL_ParseTempEntity(void)
                        MSG_ReadVector(pos, cls.protocol);
                        CL_FindNonSolidLocation(pos, pos, 4);
                        CL_ParticleEffect(EFFECT_TE_GUNSHOT, 1, pos, pos, vec3_origin, vec3_origin, NULL, 0);
+                       if(cl_sound_ric_gunshot.integer)
+                       {
+                               if (rand() % 5)
+                                       S_StartSound(-1, 0, cl.sfx_tink1, pos, 1, 1);
+                               else
+                               {
+                                       rnd = rand() & 3;
+                                       if (rnd == 1)
+                                               S_StartSound(-1, 0, cl.sfx_ric1, pos, 1, 1);
+                                       else if (rnd == 2)
+                                               S_StartSound(-1, 0, cl.sfx_ric2, pos, 1, 1);
+                                       else
+                                               S_StartSound(-1, 0, cl.sfx_ric3, pos, 1, 1);
+                               }
+                       }
                        break;
 
                case TE_GUNSHOTQUAD:
@@ -2284,6 +2315,21 @@ void CL_ParseTempEntity(void)
                        MSG_ReadVector(pos, cls.protocol);
                        CL_FindNonSolidLocation(pos, pos, 4);
                        CL_ParticleEffect(EFFECT_TE_GUNSHOTQUAD, 1, pos, pos, vec3_origin, vec3_origin, NULL, 0);
+                       if(cl_sound_ric_gunshot.integer)
+                       {
+                               if (rand() % 5)
+                                       S_StartSound(-1, 0, cl.sfx_tink1, pos, 1, 1);
+                               else
+                               {
+                                       rnd = rand() & 3;
+                                       if (rnd == 1)
+                                               S_StartSound(-1, 0, cl.sfx_ric1, pos, 1, 1);
+                                       else if (rnd == 2)
+                                               S_StartSound(-1, 0, cl.sfx_ric2, pos, 1, 1);
+                                       else
+                                               S_StartSound(-1, 0, cl.sfx_ric3, pos, 1, 1);
+                               }
+                       }
                        break;
 
                case TE_EXPLOSION:
@@ -3673,6 +3719,7 @@ void CL_Parse_Init(void)
        Cvar_RegisterVariable(&cl_sound_ric1);
        Cvar_RegisterVariable(&cl_sound_ric2);
        Cvar_RegisterVariable(&cl_sound_ric3);
+       Cvar_RegisterVariable(&cl_sound_ric_gunshot);
        Cvar_RegisterVariable(&cl_sound_r_exp3);
 
        Cvar_RegisterVariable(&cl_joinbeforedownloadsfinish);

diff --git a/clvm_cmds.c b/clvm_cmds.c
index 6e35193ae39de8937a208a2a8e0b2906129999a4..f78498121c95b9e0f7c103d608ca19811bf801f1 100644 (file)
--- a/clvm_cmds.c
+++ b/clvm_cmds.c
@@ -1331,16 +1331,29 @@ static void VM_CL_te_spark (void)
        CL_ParticleEffect(EFFECT_TE_SPARK, PRVM_G_FLOAT(OFS_PARM2), pos2, pos2, PRVM_G_VECTOR(OFS_PARM1), PRVM_G_VECTOR(OFS_PARM1), NULL, 0);
 }
 
+extern cvar_t cl_sound_ric_gunshot;
 // #412 void(vector org) te_gunshotquad (DP_QUADEFFECTS1)
 static void VM_CL_te_gunshotquad (void)
 {
        float           *pos;
        vec3_t          pos2;
+       int                     rnd;
        VM_SAFEPARMCOUNT(1, VM_CL_te_gunshotquad);
 
        pos = PRVM_G_VECTOR(OFS_PARM0);
        CL_FindNonSolidLocation(pos, pos2, 4);
        CL_ParticleEffect(EFFECT_TE_GUNSHOTQUAD, 1, pos2, pos2, vec3_origin, vec3_origin, NULL, 0);
+       if(cl_sound_ric_gunshot.integer)
+       {
+               if (rand() % 5)                 S_StartSound(-1, 0, cl.sfx_tink1, pos2, 1, 1);
+               else
+               {
+                       rnd = rand() & 3;
+                       if (rnd == 1)           S_StartSound(-1, 0, cl.sfx_ric1, pos2, 1, 1);
+                       else if (rnd == 2)      S_StartSound(-1, 0, cl.sfx_ric2, pos2, 1, 1);
+                       else                            S_StartSound(-1, 0, cl.sfx_ric3, pos2, 1, 1);
+               }
+       }
 }
 
 // #413 void(vector org) te_spikequad (DP_QUADEFFECTS1)
@@ -1429,11 +1442,23 @@ static void VM_CL_te_gunshot (void)
 {
        float           *pos;
        vec3_t          pos2;
+       int                     rnd;
        VM_SAFEPARMCOUNT(1, VM_CL_te_gunshot);
 
        pos = PRVM_G_VECTOR(OFS_PARM0);
        CL_FindNonSolidLocation(pos, pos2, 4);
        CL_ParticleEffect(EFFECT_TE_GUNSHOT, 1, pos2, pos2, vec3_origin, vec3_origin, NULL, 0);
+       if(cl_sound_ric_gunshot.integer)
+       {
+               if (rand() % 5)                 S_StartSound(-1, 0, cl.sfx_tink1, pos2, 1, 1);
+               else
+               {
+                       rnd = rand() & 3;
+                       if (rnd == 1)           S_StartSound(-1, 0, cl.sfx_ric1, pos2, 1, 1);
+                       else if (rnd == 2)      S_StartSound(-1, 0, cl.sfx_ric2, pos2, 1, 1);
+                       else                            S_StartSound(-1, 0, cl.sfx_ric3, pos2, 1, 1);
+               }
+       }
 }
 
 // #419 void(vector org) te_spike (DP_TE_STANDARDEFFECTBUILTINS)