From 1d72565cceffb395245f5bc484c41852a9ba1f06 Mon Sep 17 00:00:00 2001
From: driAn <adrian26ch@yahoo.de>
Date: Wed, 27 Aug 2008 23:07:42 +0000
Subject: [PATCH] sound on bullet water transition

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@2428 e016b1c5-ed68-44aa-a2f7-31cac88cffde
---
 source/src/renderparticles.cpp | 5 ++++-
 source/src/sound.h             | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/source/src/renderparticles.cpp b/source/src/renderparticles.cpp
index 6cc33cca..2837c7fc 100644
--- a/source/src/renderparticles.cpp
+++ b/source/src/renderparticles.cpp
@@ -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;
 }
 
diff --git a/source/src/sound.h b/source/src/sound.h
index a44d4214..add61834 100644
--- a/source/src/sound.h
+++ b/source/src/sound.h
@@ -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,