# HG changeset patch # User unc0rr # Date 1204901223 0 # Node ID 0323e5c7ee54d05a2c607c7539eb5ad6c329fd78 # Parent e95f16b7ec802b9acf7c3edac6aec13db340135d - 'Incoming!' shout when the plane appears - Opponent's hedgehogs says you "I'll get you!" diff -r e95f16b7ec80 -r 0323e5c7ee54 hedgewars/GSHandlers.inc --- a/hedgewars/GSHandlers.inc Fri Mar 07 14:32:26 2008 +0000 +++ b/hedgewars/GSHandlers.inc Fri Mar 07 14:47:03 2008 +0000 @@ -1114,10 +1114,10 @@ if int2hwFloat(TargetPoint.Y) - Gear^.Y > _0 then Gear^.dX:= Gear^.dX - cBombsSpeed * hwSqrt((int2hwFloat(TargetPoint.Y) - Gear^.Y) * 2 / cGravity) * Gear^.Tag; -addfilelog('attack: x = '+floattostr(gear^.dx)); Gear^.Health:= 6; -Gear^.doStep:= @doStepAirAttackWork +Gear^.doStep:= @doStepAirAttackWork; +PlaySound(sndIncoming, false) end; //////////////////////////////////////////////////////////////////////////////// diff -r e95f16b7ec80 -r 0323e5c7ee54 hedgewars/uConsts.pas --- a/hedgewars/uConsts.pas Fri Mar 07 14:32:26 2008 +0000 +++ b/hedgewars/uConsts.pas Fri Mar 07 14:47:03 2008 +0000 @@ -56,7 +56,7 @@ TSound = (sndGrenadeImpact, sndExplosion, sndThrowPowerUp, sndThrowRelease, sndSplash, sndShotgunReload, sndShotgunFire, sndGraveImpact, sndMineTick, sndPickhammer, sndGun, sndUFO, sndJump1, sndJump2, - sndJump3, sndYesSir, sndLaugh); + sndJump3, sndYesSir, sndLaugh, sndIllGetYou, sndIncoming); TAmmoType = (amGrenade, amClusterBomb, amBazooka, amUFO, amShotgun, amPickHammer, amSkip, amRope, amMine, amDEagle, amDynamite, amFirePunch, @@ -363,7 +363,9 @@ (FileName: 'Jump2.ogg'; Path: ptVoices; id: nil; lastChan: 0),// sndJump2 (FileName: 'Jump3.ogg'; Path: ptVoices; id: nil; lastChan: 0),// sndJump3 (FileName: 'Yessir.ogg'; Path: ptVoices; id: nil; lastChan: 0),// sndYesSir - (FileName: 'Laugh.ogg'; Path: ptVoices; id: nil; lastChan: 0) // sndLaugh + (FileName: 'Laugh.ogg'; Path: ptVoices; id: nil; lastChan: 0),// sndLaugh + (FileName: 'Illgetyou.ogg'; Path: ptVoices; id: nil; lastChan: 0),// sndIllGetYou + (FileName: 'Incoming.ogg'; Path: ptVoices; id: nil; lastChan: 0) // sndIncoming ); Ammoz: array [TAmmoType] of record diff -r e95f16b7ec80 -r 0323e5c7ee54 hedgewars/uTeams.pas --- a/hedgewars/uTeams.pas Fri Mar 07 14:32:26 2008 +0000 +++ b/hedgewars/uTeams.pas Fri Mar 07 14:47:03 2008 +0000 @@ -196,7 +196,10 @@ else SetBinds(CurrentTeam^.Binds); bShowFinger:= true; -if not (CurrentTeam^.ExtDriven or (CurrentHedgehog^.BotLevel > 0)) then PlaySound(sndYesSir, false); +if (CurrentTeam^.ExtDriven or (CurrentHedgehog^.BotLevel > 0)) then + PlaySound(sndIllGetYou, false) +else + PlaySound(sndYesSir, false); TurnTimeLeft:= cHedgehogTurnTime end;