# HG changeset patch
# User smaxx
# Date 1284327800 -7200
# Node ID fbe2e9722fc96f982f515241b8a1ca5f0783cb6c
# Parent  df6ecca1894fb0a249f1ebafea999555c294d674
Sounds:
* Added new sounds: Parachute, bump (e.g. hog falls too far), Drill Rocket
* Replaced existing sounds: Baseball bat, Rope

diff -r df6ecca1894f -r fbe2e9722fc9 hedgewars/GSHandlers.inc
--- a/hedgewars/GSHandlers.inc	Sun Sep 12 17:38:14 2010 -0400
+++ b/hedgewars/GSHandlers.inc	Sun Sep 12 23:43:20 2010 +0200
@@ -179,6 +179,7 @@
     if _0_4 < Gear^.dY then
     begin
         dmg := ModifyDamage(1 + hwRound((hwAbs(Gear^.dY) - _0_4) * 70), Gear);
+        PlaySound(sndBump);
         if dmg < 1 then exit;
 
         for i:= min(12, (3 + dmg div 10)) downto 0 do
diff -r df6ecca1894f -r fbe2e9722fc9 hedgewars/HHHandlers.inc
--- a/hedgewars/HHHandlers.inc	Sun Sep 12 17:38:14 2010 -0400
+++ b/hedgewars/HHHandlers.inc	Sun Sep 12 23:43:20 2010 +0200
@@ -211,7 +211,10 @@
                                  CurAmmoGear:= AddGear(hwRound(lx) + hwSign(dX) * 10, hwRound(ly), gtShover, gsttmpFlag, xx * _0_5, yy * _0_5, 0);
                                  PlaySound(sndBaseballBat) // TODO: Only play if something is hit?
                                  end;
-                    amParachute: CurAmmoGear:= AddGear(hwRound(lx), hwRound(ly), gtParachute, 0, _0, _0, 0);
+                    amParachute: begin
+                                 CurAmmoGear:= AddGear(hwRound(lx), hwRound(ly), gtParachute, 0, _0, _0, 0);
+                                 PlaySound(sndParachute)
+                                 end;
                     // we save CurWeapon^.Pos (in this case: cursor direction) by using it as (otherwise irrelevant) X value of the new gear.
                     amAirAttack: AddGear(CurWeapon^.Pos, 0, gtAirAttack, 0, _0, _0, 0);
                    amMineStrike: AddGear(CurWeapon^.Pos, 0, gtAirAttack, 1, _0, _0, 0);
diff -r df6ecca1894f -r fbe2e9722fc9 hedgewars/uConsts.pas
--- a/hedgewars/uConsts.pas	Sun Sep 12 17:38:14 2010 -0400
+++ b/hedgewars/uConsts.pas	Sun Sep 12 23:43:20 2010 +0200
@@ -123,7 +123,7 @@
             sndPoisonCough, sndPoisonMoan, sndBirdyLay, sndWhistle, sndBeeWater,
             sndPiano0, sndPiano1, sndPiano2, sndPiano3, sndPiano4, sndPiano5, sndPiano6, sndPiano7, sndPiano8,
             sndSkip, sndSineGun, sndOoff1, sndOoff2, sndOoff3, sndWhack,
-            sndComeonthen);
+            sndComeonthen, sndParachute, sndBump);
 
     TAmmoType  = (amNothing, amGrenade, amClusterBomb, amBazooka, amBee, amShotgun, amPickHammer, // 6
             amSkip, amRope, amMine, amDEagle, amDynamite, amFirePunch, amWhip, // 13
@@ -918,7 +918,7 @@
             (FileName:             'Droplet2.ogg'; Path: ptSounds),// sndDroplet2
             (FileName:             'Droplet3.ogg'; Path: ptSounds),// sndDroplet3
             (FileName:                  'egg.ogg'; Path: ptSounds),// sndEggBreak
-            (FileName:           'pickhammer.ogg'; Path: ptSounds),// sndDrillRocket
+            (FileName:             'drillgun.ogg'; Path: ptSounds),// sndDrillRocket
             (FileName:          'PoisonCough.ogg'; Path: ptVoices),// sndPoisonCough
             (FileName:           'PoisonMoan.ogg'; Path: ptVoices),// sndPoisonMoan
             (FileName:             'BirdyLay.ogg'; Path: ptSounds),// sndBirdyLay
@@ -939,7 +939,9 @@
             (FileName:                'Ooff2.ogg'; Path: ptVoices),// sndOoff2
             (FileName:                'Ooff3.ogg'; Path: ptVoices),// sndOoff3
             (FileName:            'whipcrack.ogg'; Path: ptSounds),// sndWhack
-            (FileName:           'Comeonthen.ogg'; Path: ptVoices) // sndComeonthen
+            (FileName:           'Comeonthen.ogg'; Path: ptVoices),// sndComeonthen
+            (FileName:            'parachute.ogg'; Path: ptSounds),// sndParachute
+            (FileName:                 'bump.ogg'; Path: ptSounds) // sndBump
             );
 
     Ammoz: array [TAmmoType] of record
diff -r df6ecca1894f -r fbe2e9722fc9 share/hedgewars/Data/Sounds/baseballbat.ogg
Binary file share/hedgewars/Data/Sounds/baseballbat.ogg has changed
diff -r df6ecca1894f -r fbe2e9722fc9 share/hedgewars/Data/Sounds/bump.ogg
Binary file share/hedgewars/Data/Sounds/bump.ogg has changed
diff -r df6ecca1894f -r fbe2e9722fc9 share/hedgewars/Data/Sounds/drillgun.ogg
Binary file share/hedgewars/Data/Sounds/drillgun.ogg has changed
diff -r df6ecca1894f -r fbe2e9722fc9 share/hedgewars/Data/Sounds/parachute.ogg
Binary file share/hedgewars/Data/Sounds/parachute.ogg has changed
diff -r df6ecca1894f -r fbe2e9722fc9 share/hedgewars/Data/Sounds/ropeattach.ogg
Binary file share/hedgewars/Data/Sounds/ropeattach.ogg has changed
diff -r df6ecca1894f -r fbe2e9722fc9 share/hedgewars/Data/Sounds/roperelease.ogg
Binary file share/hedgewars/Data/Sounds/roperelease.ogg has changed
diff -r df6ecca1894f -r fbe2e9722fc9 share/hedgewars/Data/Sounds/ropeshot.ogg
Binary file share/hedgewars/Data/Sounds/ropeshot.ogg has changed