hedgewars: comparison hedgewars/HHHandlers.inc

equal deleted inserted replaced

-:803d0142594e
+:11fce231f24a
 else if (Ammo^[CurSlot, CurAmmo].Propz and ammoprop_Power) = 0 then Message:= Message and not gm_Attack
 else begin
 if Power = 0 then
 begin
 AttackBar:= CurrentTeam^.AttackBar;
-PlaySound(sndThrowPowerUp, false, nil)
+PlaySound(sndThrowPowerUp)
 end;
 inc(Power)
 end;
 if ((Message and gm_Attack) <> 0) then exit;
 if (Ammo^[CurSlot, CurAmmo].Propz and ammoprop_Power) <> 0 then
 begin
 StopSound(sndThrowPowerUp);
-PlaySound(sndThrowRelease, false, nil);
+PlaySound(sndThrowRelease);
 end;
 xx:= SignAs(AngleSin(Angle), dX);
 yy:= -AngleCos(Angle);
 if ((Gear^.State and gstHHHJump) <> 0) then xx:= - xx;
 if Ammo^[CurSlot, CurAmmo].AttackVoice <> sndNone then
-PlaySound(Ammo^[CurSlot, CurAmmo].AttackVoice, false, CurrentTeam^.voicepack);
+PlaySound(Ammo^[CurSlot, CurAmmo].AttackVoice, CurrentTeam^.voicepack);
 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);
 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);
 amShotgun: begin
-PlaySound(sndShotgunReload, false, nil);
+PlaySound(sndShotgunReload);
 CurAmmoGear:= AddGear(hwRound(X), hwRound(Y), gtShotgunShot,  0, xx * _0_5, yy * _0_5, 0);
 end;
 amPickHammer: CurAmmoGear:= AddGear(hwRound(Gear^.X), hwRound(Gear^.Y) + cHHRadius, gtPickHammer, 0, _0, _0, 0);
 amSkip: ParseCommand('/skip', true);
 amRope: CurAmmoGear:= AddGear(hwRound(Gear^.X), hwRound(Gear^.Y), gtRope, 0, xx, yy, 0);
 amSniperRifle: CurAmmoGear:= AddGear(hwRound(X + xx * cHHRadius), hwRound(Y + yy * cHHRadius), gtSniperRifleShot, 0, xx * _0_5, yy * _0_5, 0);
 amDynamite: AddGear(hwRound(X) + hwSign(dX) * 7, hwRound(Y), gtDynamite, 0, SignAs(_0_03, dX), _0, 5000);
 amFirePunch: CurAmmoGear:= AddGear(hwRound(X) + hwSign(dX) * 10, hwRound(Y), gtFirePunch, 0, xx, _0, 0);
 amWhip: begin
 CurAmmoGear:= AddGear(hwRound(X) + hwSign(dX) * 10, hwRound(Y), gtWhip, 0, SignAs(_1, dX), - _0_8, 0);
-PlaySound(sndWhipCrack, false, nil)
+PlaySound(sndWhipCrack)
 end;
 amBaseballBat: begin
 								 CurAmmoGear:= AddGear(hwRound(X) + hwSign(dX) * 10, hwRound(Y), gtShover, gsttmpFlag, xx * _0_5, yy * _0_5, 0);
-								 PlaySound(sndBaseballBat, false, nil);
+								 PlaySound(sndBaseballBat)
 								 end;
 amParachute: CurAmmoGear:= AddGear(hwRound(X), hwRound(Y), gtParachute, 0, _0, _0, 0);
 amAirAttack: AddGear(Ammo^[CurSlot, CurAmmo].Pos, 0, gtAirAttack, 0, _0, _0, 0);
 amMineStrike: AddGear(Ammo^[CurSlot, CurAmmo].Pos, 0, gtAirAttack, 1, _0, _0, 0);
 amBlowTorch: CurAmmoGear:= AddGear(hwRound(X), hwRound(Y), gtBlowTorch, 0, SignAs(_0_5, dX), _0, 0);
 amGirder: CurAmmoGear:= AddGear(0, 0, gtGirder, Ammo^[CurSlot, CurAmmo].Pos, _0, _0, 0);
 amTeleport: CurAmmoGear:= AddGear(0, 0, gtTeleport, 0, _0, _0, 0);
 amSwitch: CurAmmoGear:= AddGear(hwRound(X), hwRound(Y), gtSwitcher, 0, _0, _0, 0);
 amMortar: begin
-				playSound(sndMortar, false, nil);
+				playSound(sndMortar);
 				FollowGear:= AddGear(hwRound(X), hwRound(Y), gtMortar,  0, xx*cMaxPower/cPowerDivisor, yy*cMaxPower/cPowerDivisor, 0);
 				 end;
 amRCPlane: begin
 CurAmmoGear:= AddGear(hwRound(X), hwRound(Y), gtRCPlane,  0, xx * cMaxPower / cPowerDivisor / 4, yy * cMaxPower / cPowerDivisor / 4, 0);
-PlaySound(sndRCPlane, true, nil)
+CurAmmoGear^.SoundChannel:= LoopSound(sndRCPlane, nil)
 end;
 amKamikaze: CurAmmoGear:= AddGear(hwRound(X), hwRound(Y), gtKamikaze, 0, xx * _0_5, yy * _0_5, 0);
 amCake: CurAmmoGear:= AddGear(hwRound(X) + hwSign(dX) * 3, hwRound(Y), gtCake, 0, xx, _0, 0);
 amSeduction: CurAmmoGear:= AddGear(hwRound(X + xx * cHHRadius * 2), hwRound(Y + yy * cHHRadius * 2), gtSeduction, 0, xx * _0_4, yy * _0_4, 0);
 amWatermelon: FollowGear:= AddGear(hwRound(X), hwRound(Y), gtWatermelon,  0, xx*Power/cPowerDivisor, yy*Power/cPowerDivisor, Ammo^[CurSlot, CurAmmo].Timer);
 	begin
 	AllInactive:= false;
 	Gear^.Z:= cCurrHHZ;
 	RemoveGearFromList(Gear);
 	InsertGearToList(Gear);
-	PlaySound(sndByeBye, false, PHedgehog(Gear^.Hedgehog)^.Team^.voicepack);
+	PlaySound(sndByeBye, PHedgehog(Gear^.Hedgehog)^.Team^.voicepack);
 	Gear^.Pos:= 0;
 	Gear^.Timer:= timertime
 	end
 end;
 var s: shortstring;
 a: TAmmoType;
 	i: Integer;
 begin
 Gear^.Message:= gm_Destroy;
-PlaySound(sndShotgunReload, false, nil);
+PlaySound(sndShotgunReload);
 case Gear^.Pos of
 posCaseUtility,
 posCaseAmmo: begin
 a:= TAmmoType(Gear^.State);
 AddAmmo(PHedgehog(HH^.Hedgehog)^, a);
 or   TestCollisionYwithGear(Gear, -1)) then
 begin
 Gear^.dY:= -_0_15;
 if not cArtillery then Gear^.dX:= SignAs(_0_15, Gear^.dX);
 Gear^.State:= Gear^.State or gstMoving or gstHHJumping;
-PlaySound(sndJump1, false, PHedgehog(Gear^.Hedgehog)^.Team^.voicepack);
+PlaySound(sndJump1, PHedgehog(Gear^.Hedgehog)^.Team^.voicepack);
 exit
 end;
 end;
 if ((Gear^.Message and gm_HJump ) <> 0) then
 Gear^.Message:= Gear^.Message and not gm_HJump;
 Gear^.dY:= -_0_2;
 SetLittle(Gear^.dX);
 Gear^.State:= Gear^.State or gstMoving or gstHHJumping;
-PlaySound(sndJump3, false, PHedgehog(Gear^.Hedgehog)^.Team^.voicepack);
+PlaySound(sndJump3, PHedgehog(Gear^.Hedgehog)^.Team^.voicepack);
 exit
 end;
 PrevdX:= hwSign(Gear^.dX);
 if (Gear^.Message and gm_Left  )<>0 then Gear^.dX:= -cLittle else
 begin
 inc(Gear^.FlightTime, 1);
 	if Gear^.FlightTime = 2000 then
 		begin
 		AddCaption(GetEventString(eidHomerun), cWhiteColor, capgrpMessage);
-		PlaySound(sndHomerun, false, nil)
+		PlaySound(sndHomerun)
 		end;
 	end
 else
 begin
 Gear^.FlightTime:= 0;
 	end;
 if (Gear^.State and gstAnimation) <> 0 then
 	begin
 	Gear^.Message:= 0;
-	if (Gear^.Pos = Wavez[TWave(Gear^.Tag)].VoiceDelay) and (Gear^.Timer = 0) then PlaySound(Wavez[TWave(Gear^.Tag)].Voice, false, PHedgehog(Gear^.Hedgehog)^.Team^.voicepack);
+	if (Gear^.Pos = Wavez[TWave(Gear^.Tag)].VoiceDelay) and (Gear^.Timer = 0) then PlaySound(Wavez[TWave(Gear^.Tag)].Voice, PHedgehog(Gear^.Hedgehog)^.Team^.voicepack);
 	inc(Gear^.Timer);
 	if Gear^.Timer = Wavez[TWave(Gear^.Tag)].Interval then
 		begin
 		Gear^.Timer:= 0;
 		inc(Gear^.Pos);
 		if (not (hwAbs(Gear^.dX) > cLittle)) and (Gear^.dY < -_0_02) then
 			begin
 			Gear^.State:= Gear^.State or gstHHHJump;
 			Gear^.dY:= -_0_25;
 			if not cArtillery then Gear^.dX:= -SignAs(_0_02, Gear^.dX);
-			PlaySound(sndJump2, false, PHedgehog(Gear^.Hedgehog)^.Team^.voicepack)
+			PlaySound(sndJump2, PHedgehog(Gear^.Hedgehog)^.Team^.voicepack)
 			end;
 	Gear^.Message:= Gear^.Message and not (gm_LJump or gm_HJump);
 	if (not cArtillery) and wasJumping and

changeset 2745	11fce231f24a
parent 2660	04c03640a7b0
child 2762	2fbc8d35eb52