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.
Add new minigun sound
authoralfadur
Sun, 11 Mar 2018 10:50:02 +0100
changeset 13166 aa7915ceb69f
parent 13165 2e9221a9a9b3
child 13167 9ec7d2fb9da7
Add new minigun sound
hedgewars/uGearsHandlersMess.pas file | annotate | diff | comparison | revisions
hedgewars/uGearsHedgehog.pas file | annotate | diff | comparison | revisions
hedgewars/uSound.pas file | annotate | diff | comparison | revisions
hedgewars/uTypes.pas file | annotate | diff | comparison | revisions
share/hedgewars/Data/Sounds/minigun.ogg file | annotate | diff | comparison | revisions 
--- a/hedgewars/uGearsHandlersMess.pas	Sun Mar 11 00:46:22 2018 +0100
+++ b/hedgewars/uGearsHandlersMess.pas	Sun Mar 11 10:50:02 2018 +0100
@@ -6757,7 +6757,6 @@
     if (Gear^.Hedgehog <> nil) and (Gear^.Hedgehog^.Gear <> nil) then
         Gear^.Data:= Pointer(Gear^.Hedgehog^.Gear);
 
-    PlaySound(sndGun);
     Gear^.X := Gear^.X + Gear^.dX * 2;
     Gear^.Y := Gear^.Y + Gear^.dY * 2;
     Gear^.FlightTime := 0;
--- a/hedgewars/uGearsHedgehog.pas	Sun Mar 11 00:46:22 2018 +0100
+++ b/hedgewars/uGearsHedgehog.pas	Sun Mar 11 10:50:02 2018 +0100
@@ -323,7 +323,10 @@
                                  newGear^.Radius:= 4 // temporarily shrink so it doesn't instantly embed in the ground
                                  end;
                        amDEagle: newGear:= AddGear(hwRound(lx + xx * cHHRadius), hwRound(ly + yy * cHHRadius), gtDEagleShot, 0, xx * _0_5, yy * _0_5, 0);
-                      amMinigun: newGear:= AddGear(hwRound(lx + xx * cHHRadius), hwRound(ly + yy * cHHRadius), gtMinigun, 0, xx * _0_5, yy * _0_5, 0);
+                      amMinigun: begin
+                                 PlaySound(sndMinigun);
+                                 newGear:= AddGear(hwRound(lx + xx * cHHRadius), hwRound(ly + yy * cHHRadius), gtMinigun, 0, xx * _0_5, yy * _0_5, 0);
+                                 end;
                       amSineGun: newGear:= AddGear(hwRound(lx + xx * cHHRadius), hwRound(ly + yy * cHHRadius), gtSineGunShot, 0, xx * _0_5, yy * _0_5, 0);
                     amPortalGun: begin
                                  newGear:= AddGear(hwRound(lx + xx * cHHRadius), hwRound(ly + yy * cHHRadius), gtPortal, 0, xx * _0_6, yy * _0_6,
--- a/hedgewars/uSound.pas	Sun Mar 11 00:46:22 2018 +0100
+++ b/hedgewars/uSound.pas	Sun Mar 11 10:50:02 2018 +0100
@@ -286,7 +286,8 @@
             (FileName:              'custom5.ogg'; Path: ptSounds; AltPath: ptNone),// sndCustom5
             (FileName:              'custom6.ogg'; Path: ptSounds; AltPath: ptNone),// sndCustom6
             (FileName:              'custom7.ogg'; Path: ptSounds; AltPath: ptNone),// sndCustom7
-            (FileName:              'custom8.ogg'; Path: ptSounds; AltPath: ptNone) // sndCustom8
+            (FileName:              'custom8.ogg'; Path: ptSounds; AltPath: ptNone),// sndCustom8
+            (FileName:              'minigun.ogg'; Path: ptSounds; AltPath: ptNone) // sndMinigun
             );
 
 
--- a/hedgewars/uTypes.pas	Sun Mar 11 00:46:22 2018 +0100
+++ b/hedgewars/uTypes.pas	Sun Mar 11 10:50:02 2018 +0100
@@ -151,7 +151,7 @@
             sndInvulnerable, sndJetpackLaunch, sndJetpackBoost, sndPortalShot, sndPortalSwitch,
             sndPortalOpen, sndBlowTorch, sndCountdown1, sndCountdown2, sndCountdown3, sndCountdown4,
             sndDuckDrop, sndDuckWater, sndDuckDie, sndCustom1, sndCustom2, sndCustom3, sndCustom4,
-            sndCustom5, sndCustom6, sndCustom7, sndCustom8);
+            sndCustom5, sndCustom6, sndCustom7, sndCustom8, sndMinigun);
 
     // Available ammo types to be used by hedgehogs
     TAmmoType  = (amNothing, amGrenade, amClusterBomb, amBazooka, amBee, amShotgun, amPickHammer, // 6
Binary file share/hedgewars/Data/Sounds/minigun.ogg has changed
sheepy-clone