# HG changeset patch # User koda # Date 1255650858 0 # Node ID 44b66fbf37dac66f386e8b132c6c0371a1b55e83 # Parent 135b11674ac19384d2efed3c88a238a9db995f41 molotov sound FTW diff -r 135b11674ac1 -r 44b66fbf37da hedgewars/GSHandlers.inc --- a/hedgewars/GSHandlers.inc Thu Oct 15 21:47:24 2009 +0000 +++ b/hedgewars/GSHandlers.inc Thu Oct 15 23:54:18 2009 +0000 @@ -226,7 +226,8 @@ CalcRotationDirAngle(Gear); if (Gear^.State and gstCollision) <> 0 then begin - doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), 5, EXPLAutoSound); + PlaySound(sndMolotov, false, nil); + //doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), 5, EXPLAutoSound); for i:= 0 to 40 do begin dX:= AngleCos(i * 2) * ((_0_08*(i mod 10))) * (GetRandom + _1); dY:= AngleSin(i * 8) * _0_5 * (GetRandom + _1); diff -r 135b11674ac1 -r 44b66fbf37da hedgewars/HHHandlers.inc --- a/hedgewars/HHHandlers.inc Thu Oct 15 21:47:24 2009 +0000 +++ b/hedgewars/HHHandlers.inc Thu Oct 15 23:54:18 2009 +0000 @@ -138,7 +138,7 @@ if ((Gear^.State and gstHHHJump) <> 0) then xx:= - xx; case Ammo^[CurSlot, CurAmmo].AmmoType of amGrenade: FollowGear:= AddGear(hwRound(X), hwRound(Y), gtAmmo_Bomb, 0, xx*Power/cPowerDivisor, yy*Power/cPowerDivisor, Ammo^[CurSlot, CurAmmo].Timer); - amMolotov: FollowGear:= AddGear(hwRound(X), hwRound(Y), gtMolotov, 0, xx*Power/cPowerDivisor, yy*Power/cPowerDivisor, 0); + amMolotov: FollowGear:= AddGear(hwRound(X), hwRound(Y), gtMolotov, 0, xx*Power/cPowerDivisor, yy*Power/cPowerDivisor, 0); amClusterBomb: FollowGear:= AddGear(hwRound(X), hwRound(Y), gtClusterBomb, 0, xx*Power/cPowerDivisor, yy*Power/cPowerDivisor, Ammo^[CurSlot, CurAmmo].Timer); amBazooka: FollowGear:= AddGear(hwRound(X), hwRound(Y), gtAmmo_Grenade, 0, xx*Power/cPowerDivisor, yy*Power/cPowerDivisor, 0); amUFO: FollowGear:= AddGear(hwRound(X), hwRound(Y), gtUFO, 0, xx*Power/cPowerDivisor, yy*Power/cPowerDivisor, 0); diff -r 135b11674ac1 -r 44b66fbf37da hedgewars/uConsts.pas --- a/hedgewars/uConsts.pas Thu Oct 15 21:47:24 2009 +0000 +++ b/hedgewars/uConsts.pas Thu Oct 15 23:54:18 2009 +0000 @@ -95,7 +95,7 @@ sndMelon, sndHellish, sndYoohoo, sndRCPlane, sndWhipCrack, sndRideOfTheValkyries, sndDenied, sndPlaced, sndBaseballBat, sndVaporize, sndWarp, sndSuddenDeath, sndMortar, sndShutter, - sndHomerun); + sndHomerun, sndMolotov); TAmmoType = (amNothing, amGrenade, amClusterBomb, amBazooka, amUFO, amShotgun, amPickHammer, amSkip, amRope, amMine, amDEagle, amDynamite, amFirePunch, amWhip, @@ -698,8 +698,9 @@ (FileName: 'warp.ogg'; Path: ptSounds),// sndWarp (FileName: 'suddendeath.ogg'; Path: ptSounds),// sndSuddenDeath (FileName: 'mortar.ogg'; Path: ptSounds),// sndMortar - (FileName: 'shutterclick.ogg'; Path: ptSounds),// sndShutter - (FileName: 'homerun.ogg'; Path: ptSounds) // sndHomerun + (FileName: 'shutterclick.ogg'; Path: ptSounds),// sndShutter + (FileName: 'homerun.ogg'; Path: ptSounds),// sndHomerun + (FileName: 'molotov.ogg'; Path: ptSounds) // sndMolotov ); Ammoz: array [TAmmoType] of record diff -r 135b11674ac1 -r 44b66fbf37da share/hedgewars/Data/Sounds/molotov.ogg Binary file share/hedgewars/Data/Sounds/molotov.ogg has changed