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.
Fix sounds, add some more for hellish impact and sine gun
authorgrammikj
Wed, 10 Aug 2011 15:41:25 +0100
changeset 5496 0ae489d724eb
parent 5493 49769489af37 (current diff)
parent 5494 5f55e9202122 (diff)
child 5499 8fcb3831cf03
Fix sounds, add some more for hellish impact and sine gun
hedgewars/uVariables.pas file | annotate | diff | comparison | revisions
share/hedgewars/Data/Sounds/hammer.ogg file | annotate | diff | comparison | revisions
share/hedgewars/Data/Sounds/hell_growl.ogg file | annotate | diff | comparison | revisions
share/hedgewars/Data/Sounds/hell_ooff.ogg file | annotate | diff | comparison | revisions
share/hedgewars/Data/Sounds/hell_ow.ogg file | annotate | diff | comparison | revisions
share/hedgewars/Data/Sounds/hell_ugh.ogg file | annotate | diff | comparison | revisions
share/hedgewars/Data/Sounds/mineimpact.ogg file | annotate | diff | comparison | revisions
share/hedgewars/Data/Sounds/sinegun.ogg file | annotate | diff | comparison | revisions 
--- 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;
 
 ////////////////////////////////////////////////////////////////////////////////
--- 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
Binary file share/hedgewars/Data/Sounds/hammer.ogg has changed
Binary file share/hedgewars/Data/Sounds/hell_growl.ogg has changed
Binary file share/hedgewars/Data/Sounds/hell_ooff.ogg has changed
Binary file share/hedgewars/Data/Sounds/hell_ow.ogg has changed
Binary file share/hedgewars/Data/Sounds/hell_ugh.ogg has changed
Binary file share/hedgewars/Data/Sounds/mineimpact.ogg has changed
Binary file share/hedgewars/Data/Sounds/sinegun.ogg has changed
sheepy-clone