eukara/fteqw
1
0
Fork 0
forked from fte/fteqw
Code Pull requests Activity

few more sound fixes

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@308 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
TimeServ 2004-10-07 00:23:06 +00:00
parent 85bcbb1b20
commit fbe03ef6e3
2 changed files with 25 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
engine/client/cl_tent.c
View file

@ -531,7 +531,7 @@ void CL_ParseTEnt (void)
if (R_RunParticleEffectType(pos, NULL, 1, pt_wizspike)) if (R_RunParticleEffectType(pos, NULL, 1, pt_wizspike))
R_RunParticleEffect (pos, vec3_origin, 20, 30); 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; break;
case TE_KNIGHTSPIKE: // spike hitting wall case TE_KNIGHTSPIKE: // spike hitting wall
@ -544,7 +544,7 @@ void CL_ParseTEnt (void)
if (R_RunParticleEffectType(pos, NULL, 1, pt_knightspike)) if (R_RunParticleEffectType(pos, NULL, 1, pt_knightspike))
R_RunParticleEffect (pos, vec3_origin, 226, 20); 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; break;
case TE_SPIKE: // spike hitting wall case TE_SPIKE: // spike hitting wall
@ -560,16 +560,16 @@ void CL_ParseTEnt (void)
R_RunParticleEffect (pos, vec3_origin, 0, 10); R_RunParticleEffect (pos, vec3_origin, 0, 10);
if ( rand() % 5 ) if ( rand() % 5 )
S_StartSound (-1, 0, cl_sfx_tink1, pos, 1, 1); S_StartSound (-2, 0, cl_sfx_tink1, pos, 1, 1);
else else
{ {
rnd = rand() & 3; rnd = rand() & 3;
if (rnd == 1) 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) 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 else
S_StartSound (-1, 0, cl_sfx_ric3, pos, 1, 1); S_StartSound (-2, 0, cl_sfx_ric3, pos, 1, 1);
} }
break; break;
case TE_SUPERSPIKE: // super spike hitting wall case TE_SUPERSPIKE: // super spike hitting wall
@ -586,16 +586,16 @@ void CL_ParseTEnt (void)
R_RunParticleEffect (pos, vec3_origin, 0, 20); R_RunParticleEffect (pos, vec3_origin, 0, 20);
if ( rand() % 5 ) if ( rand() % 5 )
S_StartSound (-1, 0, cl_sfx_tink1, pos, 1, 1); S_StartSound (-2, 0, cl_sfx_tink1, pos, 1, 1);
else else
{ {
rnd = rand() & 3; rnd = rand() & 3;
if (rnd == 1) 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) 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 else
S_StartSound (-1, 0, cl_sfx_ric3, pos, 1, 1); S_StartSound (-2, 0, cl_sfx_ric3, pos, 1, 1);
} }
break; break;
@ -615,16 +615,16 @@ void CL_ParseTEnt (void)
R_RunParticleEffect (pos, vec3_origin, 0, 10); R_RunParticleEffect (pos, vec3_origin, 0, 10);
if ( rand() % 5 ) if ( rand() % 5 )
S_StartSound (-1, 0, cl_sfx_tink1, pos, 1, 1); S_StartSound (-2, 0, cl_sfx_tink1, pos, 1, 1);
else else
{ {
rnd = rand() & 3; rnd = rand() & 3;
if (rnd == 1) 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) 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 else
S_StartSound (-1, 0, cl_sfx_ric3, pos, 1, 1); S_StartSound (-2, 0, cl_sfx_ric3, pos, 1, 1);
} }
break; break;
case TE_SUPERBULLET: case TE_SUPERBULLET:
@ -641,16 +641,16 @@ void CL_ParseTEnt (void)
R_RunParticleEffect (pos, vec3_origin, 0, 20); R_RunParticleEffect (pos, vec3_origin, 0, 20);
if ( rand() % 5 ) if ( rand() % 5 )
S_StartSound (-1, 0, cl_sfx_tink1, pos, 1, 1); S_StartSound (-2, 0, cl_sfx_tink1, pos, 1, 1);
else else
{ {
rnd = rand() & 3; rnd = rand() & 3;
if (rnd == 1) 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) 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 else
S_StartSound (-1, 0, cl_sfx_ric3, pos, 1, 1); S_StartSound (-2, 0, cl_sfx_ric3, pos, 1, 1);
} }
break; break;
#endif #endif
@ -697,7 +697,7 @@ void CL_ParseTEnt (void)
pos[2] = MSG_ReadCoord (); pos[2] = MSG_ReadCoord ();
R_BlobExplosion (pos); 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; break;
case TE_LIGHTNING1: // lightning bolts case TE_LIGHTNING1: // lightning bolts
@ -1205,7 +1205,7 @@ void CLQ2_ParseTEnt (void)
} }
// sound // 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 // sprite
/* /*
@ -1286,7 +1286,7 @@ void CLQ2_ParseTEnt (void)
} }
// sound // 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 // sprite
/* if (!R_ParticleExplosionHeart(pos)) /* if (!R_ParticleExplosionHeart(pos))

6
engine/client/snd_dma.c
View file

@ -1387,7 +1387,8 @@ void S_Play(void)
else else
Q_strcpy(name, Cmd_Argv(i)); Q_strcpy(name, Cmd_Argv(i));
sfx = S_PrecacheSound(name); 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++; i++;
} }
} }
@ -1412,7 +1413,8 @@ void S_PlayVol(void)
Q_strcpy(name, Cmd_Argv(i)); Q_strcpy(name, Cmd_Argv(i));
sfx = S_PrecacheSound(name); sfx = S_PrecacheSound(name);
vol = Q_atof(Cmd_Argv(i+1)); 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; i+=2;
} }
} }