kai/assaultcube-
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sound on bullet water transition

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@2428 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
driAn
2008-08-27 23:07:42 +00:00
parent 8071456b5a
commit 1d72565cce
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/renderparticles.cpp
+4 -1
View File
@@ -602,7 +602,10 @@ bool addbullethole(dynent *d, const vec &from, const vec &to, float radius, bool
o.add(ray.mul(dist));
o.add(vec(surface).mul(0.005f));
newparticle(o, surface, bulletholettl, 7);
if(noisy && bulletbouncesound && bulletbouncesoundrad && d!=player1 && o.dist(camera1->o) <= bulletbouncesoundrad) playsound(S_BULLETHIT, &o, SP_LOW);
if(noisy && bulletbouncesound && bulletbouncesoundrad && d!=player1 && o.dist(camera1->o) <= bulletbouncesoundrad)
{
playsound(o.z<hdr.waterlevel ? S_BULLETWATERHIT : S_BULLETHIT, &o, SP_LOW);
}
return true;
}
source/src/sound.h
+2 -2
View File
@@ -3,7 +3,7 @@ enum
{
S_JUMP = 0,
S_SOFTLAND, S_HARDLAND,
S_BULLETAIR1, S_BULLETAIR2, S_BULLETHIT,
S_BULLETAIR1, S_BULLETAIR2, S_BULLETHIT, S_BULLETWATERHIT,
S_KNIFE,
S_PISTOL, S_RPISTOL,
S_SHOTGUN, S_RSHOTGUN,
@@ -18,7 +18,7 @@ enum
S_FEXPLODE,
S_SPLASH1, S_SPLASH2,
S_FLAGDROP, S_FLAGPICKUP, S_FLAGRETURN, S_FLAGSCORE,
S_GRENADEPULL, S_GRENADETHROW, S_GRENADEBOUNCE1, S_GRENADEBOUNCE2, S_RAKIMBO, S_WATERIMPACT,
S_GRENADEPULL, S_GRENADETHROW, S_GRENADEBOUNCE1, S_GRENADEBOUNCE2, S_RAKIMBO,
S_GUNCHANGE,
S_GIB, S_HEADSHOT,
S_CALLVOTE, S_VOTEPASS, S_VOTEFAIL,