Mercurial Mercurial > hedgewars / 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.
Play Ow1.ogg and Ow4.ogg when hedgehog falls
authorunc0rr
Sun, 27 Jul 2008 20:03:07 +0000
changeset 1123 ed713652afae
parent 1122 e46678a16961
child 1124 1636a3c7c061
Play Ow1.ogg and Ow4.ogg when hedgehog falls
hedgewars/GSHandlers.inc file | annotate | diff | comparison | revisions
hedgewars/uConsts.pas file | annotate | diff | comparison | revisions 
--- a/hedgewars/GSHandlers.inc	Sun Jul 27 19:53:12 2008 +0000
+++ b/hedgewars/GSHandlers.inc	Sun Jul 27 20:03:07 2008 +0000
@@ -41,11 +41,16 @@
 var dmg: Longword;
 begin
 if _0_4 < Gear^.dY then
-   begin
-   dmg:= 1 + hwRound((hwAbs(Gear^.dY) - _0_4) * 70);
-   inc(Gear^.Damage, dmg);
-   AddDamageTag(hwRound(Gear^.X), hwRound(Gear^.Y) + cHHRadius, dmg, Gear);
-   end
+	begin
+	if _0_6 < Gear^.dY then
+		PlaySound(sndOw1, false)
+	else
+		PlaySound(sndOw4, false);
+
+	dmg:= 1 + hwRound((hwAbs(Gear^.dY) - _0_4) * 70);
+	inc(Gear^.Damage, dmg);
+	AddDamageTag(hwRound(Gear^.X), hwRound(Gear^.Y) + cHHRadius, dmg, Gear);
+	end
 end;
 
 ////////////////////////////////////////////////////////////////////////////////
--- a/hedgewars/uConsts.pas	Sun Jul 27 19:53:12 2008 +0000
+++ b/hedgewars/uConsts.pas	Sun Jul 27 20:03:07 2008 +0000
@@ -69,7 +69,7 @@
                    sndMissed, sndStupid, sndFirstBlood, sndBoring, sndByeBye,
                    sndSameTeam, sndNutter, sndReinforce, sndTraitor, sndRegret,
                    sndEnemyDown, sndCoward, sndHurry, sndWatchIt, sndKamikaze,
-                   sndCake);
+                   sndCake, sndOw1, sndOw4);
 
      TAmmoType  = (amGrenade, amClusterBomb, amBazooka, amUFO, amShotgun, amPickHammer,
                    amSkip, amRope, amMine, amDEagle, amDynamite, amFirePunch, amWhip,
@@ -477,7 +477,9 @@
                 (FileName:         'Hurry.ogg'; Path: ptVoices; id: nil; lastChan: 0),// sndHurry
                 (FileName:       'Watchit.ogg'; Path: ptVoices; id: nil; lastChan: 0),// sndWatchIt
                 (FileName:      'Kamikaze.ogg'; Path: ptVoices; id: nil; lastChan: 0),// sndKamikaze
-                (FileName:         'cake2.ogg'; Path: ptSounds; id: nil; lastChan: 0) // sndCake
+                (FileName:         'cake2.ogg'; Path: ptSounds; id: nil; lastChan: 0),// sndCake
+                (FileName:           'Ow1.ogg'; Path: ptVoices; id: nil; lastChan: 0),// sndOw1
+                (FileName:           'Ow4.ogg'; Path: ptVoices; id: nil; lastChan: 0) // sndOw4
                 );
 
       Ammoz: array [TAmmoType] of record
hedgewars