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.
molotov sound FTW
authorkoda
Thu, 15 Oct 2009 23:54:18 +0000
changeset 2470 44b66fbf37da
parent 2469 135b11674ac1
child 2471 1cfc9f897616
molotov sound FTW
hedgewars/GSHandlers.inc file | annotate | diff | comparison | revisions
hedgewars/HHHandlers.inc file | annotate | diff | comparison | revisions
hedgewars/uConsts.pas file | annotate | diff | comparison | revisions
share/hedgewars/Data/Sounds/molotov.ogg file | annotate | diff | comparison | revisions 
--- 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);
--- 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);
--- 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
Binary file share/hedgewars/Data/Sounds/molotov.ogg has changed
hedgewars