# HG changeset patch
# User grammikj
# Date 1312987285 -3600
# Node ID 0ae489d724eb93fa83889c7c705f080ace52bbed
# Parent  49769489af3766e0e06a1bf3c1728576d331e7dd# Parent  5f55e920212239bc4232284f8ac2f36f6835a23d
Fix sounds, add some more for hellish impact and sine gun

diff -r 49769489af37 -r 0ae489d724eb hedgewars/GSHandlers.inc
--- a/hedgewars/GSHandlers.inc	Fri Aug 05 12:19:01 2011 +0100
+++ b/hedgewars/GSHandlers.inc	Wed Aug 10 15:41:25 2011 +0100
@@ -257,16 +257,14 @@
     AllInactive := false;
     Gear^.Y := Gear^.Y + cDrownSpeed;
     Gear^.X := Gear^.X + Gear^.dX * cDrownSpeed;
-    if (not SuddenDeathDmg and (cWaterOpacity > $FE)) or (SuddenDeathDmg and (cSDWaterOpacity > $FE)) or (hwRound(Gear^.Y) > Gear^.Radius + cWaterLine + cVisibleWater) then
-        DeleteGear(Gear);
     // Create some bubbles (0.5% might be better but causes too few bubbles sometimes)
     if ((not SuddenDeathDmg and (cWaterOpacity < $FF)) or (SuddenDeathDmg and (cSDWaterOpacity < $FF))) and ((GameTicks and $1F) = 0) then
         if (Gear^.Kind = gtHedgehog) and (Random(4) = 0) then
-            AddVisualGear(hwRound(Gear^.X) - Gear^.Radius, hwRound(Gear^.Y) - Gear^.Radius,
-            vgtBubble)
+            AddVisualGear(hwRound(Gear^.X) - Gear^.Radius, hwRound(Gear^.Y) - Gear^.Radius, vgtBubble)
     else if Random(12) = 0 then
-             AddVisualGear(hwRound(Gear^.X) - Gear^.Radius, hwRound(Gear^.Y) - Gear^.Radius,
-             vgtBubble)
+             AddVisualGear(hwRound(Gear^.X) - Gear^.Radius, hwRound(Gear^.Y) - Gear^.Radius, vgtBubble);
+    if (not SuddenDeathDmg and (cWaterOpacity > $FE)) or (SuddenDeathDmg and (cSDWaterOpacity > $FE)) or (hwRound(Gear^.Y) > Gear^.Radius + cWaterLine + cVisibleWater) then
+        DeleteGear(Gear);
 end;
 
 ////////////////////////////////////////////////////////////////////////////////
diff -r 49769489af37 -r 0ae489d724eb hedgewars/uVariables.pas
--- a/hedgewars/uVariables.pas	Fri Aug 05 12:19:01 2011 +0100
+++ b/hedgewars/uVariables.pas	Wed Aug 10 15:41:25 2011 +0100
@@ -727,7 +727,7 @@
             (FileName:                   '8C.ogg'; Path: ptSounds),// sndPiano7
             (FileName:                   '9D.ogg'; Path: ptSounds),// sndPiano8
             (FileName:                 'skip.ogg'; Path: ptSounds),// sndSkip
-            (FileName:          'shotgunfire.ogg'; Path: ptSounds),// sndSineGun
+            (FileName:              'sinegun.ogg'; Path: ptSounds),// sndSineGun
             (FileName:                'Ooff1.ogg'; Path: ptVoices),// sndOoff1
             (FileName:                'Ooff2.ogg'; Path: ptVoices),// sndOoff2
             (FileName:                'Ooff3.ogg'; Path: ptVoices),// sndOoff3
diff -r 49769489af37 -r 0ae489d724eb share/hedgewars/Data/Sounds/hammer.ogg
Binary file share/hedgewars/Data/Sounds/hammer.ogg has changed
diff -r 49769489af37 -r 0ae489d724eb share/hedgewars/Data/Sounds/hell_growl.ogg
Binary file share/hedgewars/Data/Sounds/hell_growl.ogg has changed
diff -r 49769489af37 -r 0ae489d724eb share/hedgewars/Data/Sounds/hell_ooff.ogg
Binary file share/hedgewars/Data/Sounds/hell_ooff.ogg has changed
diff -r 49769489af37 -r 0ae489d724eb share/hedgewars/Data/Sounds/hell_ow.ogg
Binary file share/hedgewars/Data/Sounds/hell_ow.ogg has changed
diff -r 49769489af37 -r 0ae489d724eb share/hedgewars/Data/Sounds/hell_ugh.ogg
Binary file share/hedgewars/Data/Sounds/hell_ugh.ogg has changed
diff -r 49769489af37 -r 0ae489d724eb share/hedgewars/Data/Sounds/mineimpact.ogg
Binary file share/hedgewars/Data/Sounds/mineimpact.ogg has changed
diff -r 49769489af37 -r 0ae489d724eb share/hedgewars/Data/Sounds/sinegun.ogg
Binary file share/hedgewars/Data/Sounds/sinegun.ogg has changed