hedgewars: comparison hedgewars/GSHandlers.inc

equal deleted inserted replaced

-:803d0142594e
+:11fce231f24a
 		begin
 		d:= r - hwRound(Distance(gi^.X - x, gi^.Y - y));
 		if (d > 1) and (gi^.Kind = gtHedgehog) and not gi^.Invulnerable and (GetRandom(2) = 0) then
 			begin
 			if (CurrentHedgehog^.Gear = gi) then
-				PlaySound(sndOops, false, PHedgehog(gi^.Hedgehog)^.Team^.voicepack)
+				PlaySound(sndOops, PHedgehog(gi^.Hedgehog)^.Team^.voicepack)
 			else
 				begin
 				if (gi^.State and gstMoving) = 0 then
 					gi^.State:= gi^.State or gstLoser;
 				if d > r div 2 then
-					PlaySound(sndNooo, false, PHedgehog(gi^.Hedgehog)^.Team^.voicepack)
+					PlaySound(sndNooo, PHedgehog(gi^.Hedgehog)^.Team^.voicepack)
 				else
-					PlaySound(sndUhOh, false, PHedgehog(gi^.Hedgehog)^.Team^.voicepack);
+					PlaySound(sndUhOh, PHedgehog(gi^.Hedgehog)^.Team^.voicepack);
 				end;
 			end;
 		gi:= gi^.NextGear
 		end;
 end;
 			begin
 			Gear^.State:= Gear^.State and (not gstHHDriven);
 			AddCaption(Format(GetEventString(eidDrowned), PHedgehog(Gear^.Hedgehog)^.Name), cWhiteColor, capgrpMessage);
 			end
 end;
-PlaySound(sndSplash, false, nil)
+PlaySound(sndSplash)
 end
 else
 	CheckGearDrowning:= false
 end;
 	begin
 	dmg:= ModifyDamage(1 + hwRound((hwAbs(Gear^.dY) - _0_4) * 70), Gear);
 if dmg < 1 then exit;
 	if _0_6 < Gear^.dY then
-		PlaySound(sndOw4, false, PHedgehog(Gear^.Hedgehog)^.Team^.voicepack)
+		PlaySound(sndOw4, PHedgehog(Gear^.Hedgehog)^.Team^.voicepack)
 	else
-		PlaySound(sndOw1, false, PHedgehog(Gear^.Hedgehog)^.Team^.voicepack);
+		PlaySound(sndOw1, PHedgehog(Gear^.Hedgehog)^.Team^.voicepack);
 ApplyDamage(Gear, dmg);
 	end
 end;
 CalcRotationDirAngle(Gear);
 if Gear^.Kind = gtHellishBomb then
 	begin
-	if Gear^.Timer = 3000 then PlaySound(sndHellish, false, nil);
+	if Gear^.Timer = 3000 then PlaySound(sndHellish);
 	if (GameTicks and $3F) = 0 then
 		if (Gear^.State and gstCollision) = 0 then
 			AddGear(hwRound(Gear^.X), hwRound(Gear^.Y), gtEvilTrace, 0, _0, _0, 0);
 	end;
 if (Gear^.State and (gstCollision or gstMoving)) = (gstCollision or gstMoving) then
 	if (hwAbs(Gear^.dX) > _0_1) or
 	   (hwAbs(Gear^.dY) > _0_1) then
-		PlaySound(sndGrenadeImpact, false, nil)
+		PlaySound(sndGrenadeImpact)
 end;
 ////////////////////////////////////////////////////////////////////////////////
 procedure doStepMolotov(Gear: PGear);
 var i: LongInt;
 dX, dY: hwFloat;
 	doStepFallingGear(Gear);
 	CalcRotationDirAngle(Gear);
 	if (Gear^.State and gstCollision) <> 0 then begin
-		PlaySound(sndMolotov, false, nil);
+		PlaySound(sndMolotov);
 		//doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), 5, EXPLAutoSound);
 		for i:= 0 to 20 do begin
 				dX:= AngleCos(i * 2) * ((_0_1*(i div 5))) * (GetRandom + _1);
 				dY:= AngleSin(i * 8) * _0_5 * (GetRandom + _1);
 				Fire:= AddGear(hwRound(Gear^.X), hwRound(Gear^.Y), gtFlame, 0, dX, dY, 0);
 Gear^.dY:= - Gear^.dY * Gear^.Elasticity;
 if Gear^.dY > - _1div1024 then
 begin
 Gear^.Active:= false;
 exit
-end else if Gear^.dY < - _0_03 then PlaySound(sndGraveImpact, false, nil)
+end else if Gear^.dY < - _0_03 then PlaySound(sndGraveImpact)
 end;
 Gear^.Y:= Gear^.Y + Gear^.dY;
 CheckGearDrowning(Gear);
 Gear^.dY:= Gear^.dY + cGravity
 CheckCollision(Gear);
 dec(Gear^.Timer);
 if ((Gear^.State and gstCollision) <> 0) or (Gear^.Timer = 0) then
 begin
-StopSound(sndUFO);
+StopSound(Gear^.SoundChannel);
 doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), 50, EXPLAutoSound);
 DeleteGear(Gear);
 end;
 end;
 exit
 end;
 dec(Gear^.Timer);
 if Gear^.Timer = 0 then
 begin
-PlaySound(sndUFO, true, nil);
+Gear^.SoundChannel:= LoopSound(sndUFO);
 Gear^.Timer:= 5000;
 Gear^.doStep:= @doStepUFOWork
 end;
 end;
 if ((Gear^.State and gstAnimation) = 0) then
 	begin
 	dec(Gear^.Timer);
 	if Gear^.Timer = 0 then
 		begin
-		PlaySound(sndShotgunFire, false, nil);
+		PlaySound(sndShotgunFire);
 		Gear^.State:= Gear^.State or gstAnimation
 		end;
 	exit
 	end
 	else inc(Gear^.Timer);
 end;
 end;
 procedure doStepDEagleShot(Gear: PGear);
 begin
-PlaySound(sndGun, false, nil);
+PlaySound(sndGun);
 Gear^.doStep:= @doStepBulletWork
 end;
 procedure doStepSniperRifleShot(Gear: PGear);
 var HHGear: PGear;
 if (HHGear^.Message and gm_Attack) <> 0 then
 begin
 	Gear^.State:= Gear^.State or gstAnimation;
 Gear^.dX:= SignAs(AngleSin(HHGear^.Angle), HHGear^.dX) * _0_5;
 Gear^.dY:= -AngleCos(HHGear^.Angle) * _0_5;
-PlaySound(sndGun, false, nil);
+PlaySound(sndGun);
 Gear^.doStep:= @doStepBulletWork;
 end
 else
 if (GameTicks mod 32) = 0 then
 if (GameTicks mod 4096) < 2048 then
 AllInactive:= false;
 HHGear:= PHedgehog(Gear^.Hedgehog)^.Gear;
 dec(Gear^.Timer);
 if (Gear^.Timer = 0)or((Gear^.Message and gm_Destroy) <> 0)or((HHGear^.State and gstHHDriven) = 0) then
 	begin
-	StopSound(sndPickhammer);
+	StopSound(Gear^.SoundChannel);
 	DeleteGear(Gear);
 	AfterAttack;
 	exit
 	end;
 DrawHLinesExplosions(@ar, 3, hwRound(Gear^.Y) - cHHRadius * 2, 2, Pred(i));
 Gear^.dY:= HHGear^.dY;
 DeleteCI(HHGear);
-PlaySound(sndPickhammer, true, nil);
+Gear^.SoundChannel:= LoopSound(sndPickhammer);
 doStepPickHammerWork(Gear);
 Gear^.doStep:= @doStepPickHammerWork
 end;
 ////////////////////////////////////////////////////////////////////////////////
 		if ((GameTicks and $1F) = 0) then
 			if CheckGearNear(Gear, gtHedgehog, 46, 32) <> nil then Gear^.State:= Gear^.State or gstAttacking
 		end else // gstAttacking <> 0
 		begin
 		AllInactive:= false;
-		if (Gear^.Timer and $FF) = 0 then PlaySound(sndMineTick, false, nil);
+		if (Gear^.Timer and $FF) = 0 then PlaySound(sndMineTick);
 		if Gear^.Timer = 0 then
 			begin
 			doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), 50, EXPLAutoSound);
 			DeleteGear(Gear);
 			exit
 	if (Gear^.dY.isNegative) and TestCollisionYwithGear(Gear, -1) then Gear^.dY:= _0 else
 	if (not Gear^.dY.isNegative) and TestCollisionYwithGear(Gear, 1) then
 		begin
 		Gear^.dY:= - Gear^.dY * Gear^.Elasticity;
 		if Gear^.dY > - _0_001 then Gear^.dY:= _0
-			else if Gear^.dY < - _0_03 then PlaySound(sndGraveImpact, false, nil);
+			else if Gear^.dY < - _0_03 then PlaySound(sndGraveImpact);
 		end;
 	CheckGearDrowning(Gear);
 	end;
 if (Gear^.dY.QWordValue = 0) then AddGearCI(Gear)
 ////////////////////////////////////////////////////////////////////////////////
 procedure doStepTarget(Gear: PGear);
 begin
 if (Gear^.Timer = 0) and (Gear^.Tag = 0) then
-	PlaySound(sndWarp, false, nil);
+	PlaySound(sndWarp);
 if (Gear^.Tag = 0) and (Gear^.Timer < 1000) then
 	inc(Gear^.Timer)
 else if Gear^.Tag = 1 then
 	begin
 	if (hwRound(Gear^.Y) > cWaterLine) then
 		begin
 		for i:= 0 to 3 do
 			AddVisualGear(hwRound(Gear^.X) - 16 + Random(32), hwRound(Gear^.Y) - 16 + Random(16), vgtSteam);
-		PlaySound(sndVaporize, false, nil);
+		PlaySound(sndVaporize);
 		DeleteGear(Gear);
 		exit
 		end
 end else begin
 if (Gear^.State and gsttmpFlag) <> 0 then
 Gear^.dX:= SignAs(_0_45, Gear^.dX);
 Gear^.dY:= - _0_9;
 Gear^.doStep:= @doStepFirePunchWork;
 DrawTunnel(HHGear^.X - int2hwFloat(cHHRadius), HHGear^.Y + _1, _0_5, _0, cHHRadius * 4, 5);
-PlaySound(TSound(ord(sndFirePunch1) + GetRandom(6)), false, PHedgehog(HHGear^.Hedgehog)^.Team^.voicepack)
+PlaySound(TSound(ord(sndFirePunch1) + GetRandom(6)), PHedgehog(HHGear^.Hedgehog)^.Team^.voicepack)
 end;
 ////////////////////////////////////////////////////////////////////////////////
 procedure doStepParachuteWork(Gear: PGear);
 if (Distance(tx - x, ty - y) > _256) or
 not TryPlaceOnLand(TargetPoint.X - SpritesData[sprAmGirder].Width div 2,
 TargetPoint.Y - SpritesData[sprAmGirder].Height div 2,
 sprAmGirder, Gear^.State, true) then
 	begin
-PlaySound(sndDenied, false, nil);
+PlaySound(sndDenied);
 	HHGear^.Message:= HHGear^.Message and not gm_Attack;
 	HHGear^.State:= HHGear^.State and not gstAttacking;
 	HHGear^.State:= HHGear^.State or gstHHChooseTarget;
 	isCursorVisible:= true;
 	DeleteGear(Gear)
 	end
 else begin
-PlaySound(sndPlaced, false, nil);
+PlaySound(sndPlaced);
 	DeleteGear(Gear);
 OnUsedAmmo(PHedgehog(HHGear^.Hedgehog)^);
 ApplyAmmoChanges(PHedgehog(HHGear^.Hedgehog)^)
 	end;
 		HHGear^.Message:= HHGear^.Message and not gm_Attack;
 		HHGear^.State:= HHGear^.State and not gstAttacking;
 		HHGear^.State:= HHGear^.State or gstHHChooseTarget;
 		DeleteGear(Gear);
 		isCursorVisible:= true;
-		PlaySound(sndDenied, false, nil);
+		PlaySound(sndDenied)
 		end
 	else begin
 		DeleteCI(HHGear);
 		SetAllHHToActive;
 		Gear^.doStep:= @doStepTeleportAnim;
 		Gear^.X:= HHGear^.X;
 		Gear^.Y:= HHGear^.Y;
 		HHGear^.X:= int2hwFloat(TargetPoint.X);
 		HHGear^.Y:= int2hwFloat(TargetPoint.Y);
 		HHGear^.State:= HHGear^.State or gstMoving;
-		playSound(sndWarp, false, nil);
+		playSound(sndWarp)
 		end;
 TargetPoint.X:= NoPointX;
 end;
 	HHGear^.Active:= false;
 	HHGear^.Z:= cHHZ;
 	RemoveGearFromList(HHGear);
 	InsertGearToList(HHGear);
-	PlaySound(sndSwitchHog, false, nil);
+	PlaySound(sndSwitchHog);
 	repeat
 		CurrentTeam^.CurrHedgehog:= Succ(CurrentTeam^.CurrHedgehog) mod (CurrentTeam^.HedgehogsNumber);
 	until (CurrentTeam^.Hedgehogs[CurrentTeam^.CurrHedgehog].Gear <> nil);
 AllInactive:= false;
 dec(Gear^.Timer);
 if Gear^.Timer = 0 then
 	begin
 	Gear^.Pos:= 1;
-	PlaySound(sndKamikaze, false, PHedgehog(Gear^.Hedgehog)^.Team^.voicepack);
+	PlaySound(sndKamikaze, PHedgehog(Gear^.Hedgehog)^.Team^.voicepack);
 	Gear^.doStep:= @doStepKamikazeWork
 	end
 end;
 procedure doStepKamikaze(Gear: PGear);
 else
 			    gi^.State:= gi^.State or gstWinner;
 		gi:= gi^.NextGear
 		end;
 	Gear^.doStep:= @doStepCakeExpl;
-	PlaySound(sndCake, false, nil)
+	PlaySound(sndCake)
 	end else dec(Gear^.Pos)
 end;
 procedure doStepCakeWork(Gear: PGear);
 if Gear^.Timer > 250 then
 	begin
 	Gear^.Timer:= 0;
 	inc(Gear^.Pos);
 	if Gear^.Pos = 5 then
-		PlaySound(sndYoohoo, false, PHedgehog(Gear^.Hedgehog)^.Team^.voicepack)
+		PlaySound(sndYoohoo, PHedgehog(Gear^.Hedgehog)^.Team^.voicepack)
 	end;
 if Gear^.Pos = 14 then
 	Gear^.doStep:= @doStepSeductionWork
 end;
 	Gear^.X:= Gear^.X + Gear^.dX;
 	Gear^.Y:= Gear^.Y + Gear^.dY;
 	DrawTunnel(oX, oY, Gear^.dX, Gear^.dY, 2, 6);
 if(CheckGearDrowning(Gear)) then
 begin
-StopSound(sndPickhammer);
+StopSound(Gear^.SoundChannel);
 	    exit
 end
 	end;
 t:= CheckGearsCollision(Gear); //fixes drill not exploding when touching HH bug
 or (t^.Count <> 0)
 or (not TestCollisionYWithGear(Gear, hwSign(Gear^.dY))
 and not TestCollisionXWithGear(Gear, hwSign(Gear^.dX)))
 or (Land[hwRound(Gear^.Y), hwRound(Gear^.X)] = COLOR_INDESTRUCTIBLE) then
 	begin //out of time or exited ground
-StopSound(sndPickhammer);
+StopSound(Gear^.SoundChannel);
 	doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), 50, EXPLAutoSound);
 	DeleteGear(Gear);
 	exit
 	end;
 		doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), 50, EXPLAutoSound);
 		DeleteGear(Gear);
 		exit;
 		end;
-PlaySound(sndPickhammer, true, nil);
+Gear^.SoundChannel:= LoopSound(sndPickhammer);
 	Gear^.doStep:= @doStepDrillDrilling;
 	dec(Gear^.Timer)
 	end
 end;
 		AddGear(hwRound(Gear^.X), hwRound(Gear^.Y), gtBall, 0,
 				SignAs(AngleSin(HHGear^.Angle) * _0_8, HHGear^.dX) + rx,
 				AngleCos(HHGear^.Angle) * ( - _0_8) + ry,
 				0);
-		PlaySound(sndGun, false, nil);
+		PlaySound(sndGun);
 		end;
 	if (Gear^.Timer = 0) or (HHGear^.Damage <> 0) then
 		begin
 		DeleteGear(Gear);
 	if ((HHGear^.Message and gm_LJump) <> 0)
 		and ((Gear^.State and gsttmpFlag) = 0) then
 		begin
 		Gear^.State:= Gear^.State or gsttmpFlag;
 		PauseMusic;
-		playSound(sndRideOfTheValkyries, false, nil);
+		playSound(sndRideOfTheValkyries);
 		end;
 	// pickup bonuses
 	t:= CheckGearNear(Gear, gtCase, 36, 36);
 	if t <> nil then
 	t:= CheckGearNear(Gear, gtTarget, 36, 36);
 	if t <> nil then
 		begin
 		if t^.Tag <> 0 then // collect it only once
 			exit;
-		PlaySound(sndShotgunReload, false, nil);
+		PlaySound(sndShotgunReload);
 		t^.Tag:= 1;
 		TrainingTargetGear:= nil; // remove target cursor
 		exit;
 		end;
 if ((Gear^.State and gstCollision) <> 0) or (((TrainingFlags and tfRCPlane) <> 0) and (TurnTimeLeft = 0))
 	or CheckGearDrowning(Gear) then
 	begin
 	if ((TrainingFlags and tfRCPlane) <> 0) and ((TrainingFlags and tfTimeTrial) <> 0 ) and (TimeTrialStopTime = 0) then TimeTrialStopTime:= RealTicks;
-	StopSound(sndRCPlane);
+	StopSound(Gear^.SoundChannel);
 	StopSound(sndRideOfTheValkyries);
 	ResumeMusic;
 	if ((Gear^.State and gstCollision) <> 0) or (((TrainingFlags and tfRCPlane) <> 0) and (TurnTimeLeft = 0)) then
 		begin

changeset 2745	11fce231f24a
parent 2736	cc04e98dd535
child 2746	55593f8a490b