diff --git a/engine/client/cl_tent.c b/engine/client/cl_tent.c index 46c059571..05812470a 100644 --- a/engine/client/cl_tent.c +++ b/engine/client/cl_tent.c @@ -531,7 +531,7 @@ void CL_ParseTEnt (void) if (R_RunParticleEffectType(pos, NULL, 1, pt_wizspike)) R_RunParticleEffect (pos, vec3_origin, 20, 30); - S_StartSound (-1, 0, cl_sfx_wizhit, pos, 1, 1); + S_StartSound (-2, 0, cl_sfx_wizhit, pos, 1, 1); break; case TE_KNIGHTSPIKE: // spike hitting wall @@ -544,7 +544,7 @@ void CL_ParseTEnt (void) if (R_RunParticleEffectType(pos, NULL, 1, pt_knightspike)) R_RunParticleEffect (pos, vec3_origin, 226, 20); - S_StartSound (-1, 0, cl_sfx_knighthit, pos, 1, 1); + S_StartSound (-2, 0, cl_sfx_knighthit, pos, 1, 1); break; case TE_SPIKE: // spike hitting wall @@ -560,16 +560,16 @@ void CL_ParseTEnt (void) R_RunParticleEffect (pos, vec3_origin, 0, 10); if ( rand() % 5 ) - S_StartSound (-1, 0, cl_sfx_tink1, pos, 1, 1); + S_StartSound (-2, 0, cl_sfx_tink1, pos, 1, 1); else { rnd = rand() & 3; if (rnd == 1) - S_StartSound (-1, 0, cl_sfx_ric1, pos, 1, 1); + S_StartSound (-2, 0, cl_sfx_ric1, pos, 1, 1); else if (rnd == 2) - S_StartSound (-1, 0, cl_sfx_ric2, pos, 1, 1); + S_StartSound (-2, 0, cl_sfx_ric2, pos, 1, 1); else - S_StartSound (-1, 0, cl_sfx_ric3, pos, 1, 1); + S_StartSound (-2, 0, cl_sfx_ric3, pos, 1, 1); } break; case TE_SUPERSPIKE: // super spike hitting wall @@ -586,16 +586,16 @@ void CL_ParseTEnt (void) R_RunParticleEffect (pos, vec3_origin, 0, 20); if ( rand() % 5 ) - S_StartSound (-1, 0, cl_sfx_tink1, pos, 1, 1); + S_StartSound (-2, 0, cl_sfx_tink1, pos, 1, 1); else { rnd = rand() & 3; if (rnd == 1) - S_StartSound (-1, 0, cl_sfx_ric1, pos, 1, 1); + S_StartSound (-2, 0, cl_sfx_ric1, pos, 1, 1); else if (rnd == 2) - S_StartSound (-1, 0, cl_sfx_ric2, pos, 1, 1); + S_StartSound (-2, 0, cl_sfx_ric2, pos, 1, 1); else - S_StartSound (-1, 0, cl_sfx_ric3, pos, 1, 1); + S_StartSound (-2, 0, cl_sfx_ric3, pos, 1, 1); } break; @@ -615,16 +615,16 @@ void CL_ParseTEnt (void) R_RunParticleEffect (pos, vec3_origin, 0, 10); if ( rand() % 5 ) - S_StartSound (-1, 0, cl_sfx_tink1, pos, 1, 1); + S_StartSound (-2, 0, cl_sfx_tink1, pos, 1, 1); else { rnd = rand() & 3; if (rnd == 1) - S_StartSound (-1, 0, cl_sfx_ric1, pos, 1, 1); + S_StartSound (-2, 0, cl_sfx_ric1, pos, 1, 1); else if (rnd == 2) - S_StartSound (-1, 0, cl_sfx_ric2, pos, 1, 1); + S_StartSound (-2, 0, cl_sfx_ric2, pos, 1, 1); else - S_StartSound (-1, 0, cl_sfx_ric3, pos, 1, 1); + S_StartSound (-2, 0, cl_sfx_ric3, pos, 1, 1); } break; case TE_SUPERBULLET: @@ -641,16 +641,16 @@ void CL_ParseTEnt (void) R_RunParticleEffect (pos, vec3_origin, 0, 20); if ( rand() % 5 ) - S_StartSound (-1, 0, cl_sfx_tink1, pos, 1, 1); + S_StartSound (-2, 0, cl_sfx_tink1, pos, 1, 1); else { rnd = rand() & 3; if (rnd == 1) - S_StartSound (-1, 0, cl_sfx_ric1, pos, 1, 1); + S_StartSound (-2, 0, cl_sfx_ric1, pos, 1, 1); else if (rnd == 2) - S_StartSound (-1, 0, cl_sfx_ric2, pos, 1, 1); + S_StartSound (-2, 0, cl_sfx_ric2, pos, 1, 1); else - S_StartSound (-1, 0, cl_sfx_ric3, pos, 1, 1); + S_StartSound (-2, 0, cl_sfx_ric3, pos, 1, 1); } break; #endif @@ -697,7 +697,7 @@ void CL_ParseTEnt (void) pos[2] = MSG_ReadCoord (); R_BlobExplosion (pos); - S_StartSound (-1, 0, cl_sfx_r_exp3, pos, 1, 1); + S_StartSound (-2, 0, cl_sfx_r_exp3, pos, 1, 1); break; case TE_LIGHTNING1: // lightning bolts @@ -1205,7 +1205,7 @@ void CLQ2_ParseTEnt (void) } // sound - S_StartSound (-1, 0, S_PrecacheSound ("weapons/rocklx1a.wav"), pos, 1, 1); + S_StartSound (-2, 0, S_PrecacheSound ("weapons/rocklx1a.wav"), pos, 1, 1); // sprite /* @@ -1286,7 +1286,7 @@ void CLQ2_ParseTEnt (void) } // sound - S_StartSound (-1, 0, S_PrecacheSound ("weapons/rocklx1a.wav"), pos, 1, 1); + S_StartSound (-2, 0, S_PrecacheSound ("weapons/rocklx1a.wav"), pos, 1, 1); // sprite /* if (!R_ParticleExplosionHeart(pos)) diff --git a/engine/client/snd_dma.c b/engine/client/snd_dma.c index 28a3363d4..a142857f7 100644 --- a/engine/client/snd_dma.c +++ b/engine/client/snd_dma.c @@ -1387,7 +1387,8 @@ void S_Play(void) else Q_strcpy(name, Cmd_Argv(i)); sfx = S_PrecacheSound(name); - S_StartSound(cl.playernum[0]+1, -1, sfx, vec3_origin, 1.0, 1.0); + S_StartSound(cl.playernum[0]+1, -1, sfx, vec3_origin, 1.0, 0.0); +// hash++; i++; } } @@ -1412,7 +1413,8 @@ void S_PlayVol(void) Q_strcpy(name, Cmd_Argv(i)); sfx = S_PrecacheSound(name); vol = Q_atof(Cmd_Argv(i+1)); - S_StartSound(cl.playernum[0]+1, -1, sfx, vec3_origin, vol, 1.0); + S_StartSound(cl.playernum[0]+1, -1, sfx, vec3_origin, vol, 0.0); +// hash; i+=2; } }