Mercurial Mercurial > sheepy-clone / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
authornemo
Fri, 05 Aug 2011 14:15:19 -0400
changeset 5501 0ba2dca673e6
parent 5498 fac3c15707d2 (current diff)
parent 5493 49769489af37 (diff)
child 5503 d8632f589008
merge
hedgewars/uGears.pas file | annotate | diff | comparison | revisions 
--- a/hedgewars/uGears.pas	Fri Aug 05 14:13:06 2011 -0400
+++ b/hedgewars/uGears.pas	Fri Aug 05 14:15:19 2011 -0400
@@ -275,6 +275,8 @@
                 gear^.Density:= _1;
                 end;
        gtSnowball: begin
+                gear^.ImpactSound:= sndMudballImpact;
+                gear^.nImpactSounds:= 1;
                 gear^.Radius:= 4;
                 gear^.Elasticity:= _1;
                 gear^.Friction:= _1;
@@ -328,6 +330,8 @@
                 RopePoints.Count:= 0;
                 end;
         gtMine: begin
+                gear^.ImpactSound:= sndMineImpact;
+                gear^.nImpactSounds:= 1;
                 gear^.Health:= 10;
                 gear^.State:= gear^.State or gstMoving;
                 gear^.Radius:= 2;
--- a/hedgewars/uTypes.pas	Fri Aug 05 14:13:06 2011 -0400
+++ b/hedgewars/uTypes.pas	Fri Aug 05 14:15:19 2011 -0400
@@ -117,7 +117,8 @@
     TSound = (sndNone,
             sndGrenadeImpact, sndExplosion, sndThrowPowerUp, sndThrowRelease,
             sndSplash, sndShotgunReload, sndShotgunFire, sndGraveImpact,
-            sndMineTick, sndPickhammer, sndGun, sndBee, sndJump1, sndJump2,
+            sndMineImpact, sndMineTick, sndMudballImpact,
+            sndPickhammer, sndGun, sndBee, sndJump1, sndJump2,
             sndJump3, sndYesSir, sndLaugh, sndIllGetYou, sndIncoming,
             sndMissed, sndStupid, sndFirstBlood, sndBoring, sndByeBye,
             sndSameTeam, sndNutter, sndReinforce, sndTraitor, sndRegret,
--- a/hedgewars/uVariables.pas	Fri Aug 05 14:13:06 2011 -0400
+++ b/hedgewars/uVariables.pas	Fri Aug 05 14:15:19 2011 -0400
@@ -633,7 +633,9 @@
             (FileName:        'shotgunreload.ogg'; Path: ptSounds),// sndShotgunReload
             (FileName:          'shotgunfire.ogg'; Path: ptSounds),// sndShotgunFire
             (FileName:          'graveimpact.ogg'; Path: ptSounds),// sndGraveImpact
+            (FileName:           'mineimpact.ogg'; Path: ptSounds),// sndMineImpact
             (FileName:             'minetick.ogg'; Path: ptSounds),// sndMineTicks
+            (FileName:             'Droplet1.ogg'; Path: ptSounds),// sndMudballImpact
             (FileName:           'pickhammer.ogg'; Path: ptSounds),// sndPickhammer
             (FileName:                  'gun.ogg'; Path: ptSounds),// sndGun
             (FileName:                  'bee.ogg'; Path: ptSounds),// sndBee
@@ -729,7 +731,7 @@
             (FileName:                'Ooff1.ogg'; Path: ptVoices),// sndOoff1
             (FileName:                'Ooff2.ogg'; Path: ptVoices),// sndOoff2
             (FileName:                'Ooff3.ogg'; Path: ptVoices),// sndOoff3
-            (FileName:            'whipcrack.ogg'; Path: ptSounds),// sndWhack
+            (FileName:               'hammer.ogg'; Path: ptSounds),// sndWhack
             (FileName:           'Comeonthen.ogg'; Path: ptVoices),// sndComeonthen
             (FileName:            'parachute.ogg'; Path: ptSounds),// sndParachute
             (FileName:                 'bump.ogg'; Path: ptSounds),// sndBump
Binary file share/hedgewars/Data/Sounds/hammer.ogg has changed
Binary file share/hedgewars/Data/Sounds/mineimpact.ogg has changed
sheepy-clone