hedgewars-draft: comparison hedgewars/GSHandlers.inc

equal deleted inserted replaced

-:cefb73639f70
+:8c9dcaedc7a8
 begin
 d := r - hwRound(Distance(gi^.X - x, gi^.Y - y));
 if (d > 1) and (not gi^.Invulnerable) and (GetRandom(2) = 0) then
 begin
 if (CurrentHedgehog^.Gear = gi) then
-PlaySound(sndOops, gi^.Hedgehog^.Team^.voicepack)
+PlaySoundV(sndOops, 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, gi^.Hedgehog^.Team^.voicepack)
+PlaySoundV(sndNooo, gi^.Hedgehog^.Team^.voicepack)
 else
-PlaySound(sndUhOh, gi^.Hedgehog^.Team^.voicepack);
+PlaySoundV(sndUhOh, gi^.Hedgehog^.Team^.voicepack);
 end;
 end;
 end;
 gi := gi^.NextGear
 AddVisualGear(gX, cWaterLine, vgtSplash);
 AddVisualGear(gX - 3 + Random(6), cWaterLine, vgtDroplet);
 AddVisualGear(gX - 3 + Random(6), cWaterLine, vgtDroplet);
 AddVisualGear(gX - 3 + Random(6), cWaterLine, vgtDroplet);
 AddVisualGear(gX - 3 + Random(6), cWaterLine, vgtDroplet);
-StopSound(Gear^.SoundChannel);
+StopSoundChan(Gear^.SoundChannel);
 if nuw then
 begin
 Gear^.SoundChannel := LoopSound(sndBeeWater);
 Gear^.Tag := 1;
 end
 CheckCollision(Gear);
 if ((Gear^.State and gstCollision) <> 0) then
 begin
-StopSound(Gear^.SoundChannel);
+StopSoundChan(Gear^.SoundChannel);
 doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), 50, Gear^.Hedgehog, EXPLAutoSound);
 for i:= 0 to 31 do
 begin
 flower:= AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtStraightShot);
 if flower <> nil then
 dec(Gear^.Timer)
 else
 begin
 if nuw then
 begin
-StopSound(Gear^.SoundChannel);
+StopSoundChan(Gear^.SoundChannel);
 CheckGearDrowning(Gear);
 end
 else
 doStepFallingGear(Gear);
 end;
 dec(TurnTimeLeft);
 if (TurnTimeLeft = 0) or (Gear^.Timer = 0)
 or((Gear^.Message and gmDestroy) <> 0)
 or((HHGear^.State and gstHHDriven) =0) then
 begin
-StopSound(Gear^.SoundChannel);
+StopSoundChan(Gear^.SoundChannel);
 DeleteGear(Gear);
 AfterAttack;
 doStepHedgehogMoving(HHGear);  // for gfInfAttack
 exit
 end;
 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)), HHGear^.Hedgehog^.Team^.voicepack)
+PlaySoundV(TSound(ord(sndFirePunch1) + GetRandom(6)), HHGear^.Hedgehog^.Team^.voicepack)
 end;
 ////////////////////////////////////////////////////////////////////////////////
 procedure doStepParachuteWork(Gear: PGear);
 3: FollowGear := AddGear(hwRound(Gear^.X), hwRound(Gear^.Y), gtDrill, gsttmpFlag, cBombsSpeed * Gear^.Tag, _0, Gear^.Timer + 1);
 //4: FollowGear := AddGear(hwRound(Gear^.X), hwRound(Gear^.Y), gtWaterMelon, 0, cBombsSpeed *
 //                 Gear^.Tag, _0, 5000);
 end;
 Gear^.dX := Gear^.dX + int2hwFloat(30 * Gear^.Tag);
-StopSound(Gear^.SoundChannel, 4000);
+StopSoundChan(Gear^.SoundChannel, 4000);
 end;
 if (GameTicks and $3F) = 0 then
 AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtSmokeTrace);
 if (hwRound(Gear^.X) > (LAND_WIDTH+2048)) or (hwRound(Gear^.X) < -2048) then
 begin
 // avoid to play forever (is this necessary?)
-StopSound(Gear^.SoundChannel);
+StopSoundChan(Gear^.SoundChannel);
 DeleteGear(Gear)
 end;
 end;
 procedure doStepAirAttack(Gear: PGear);
 AllInactive := false;
 dec(Gear^.Timer);
 if Gear^.Timer = 0 then
 begin
 Gear^.Pos := 1;
-PlaySound(sndKamikaze, Gear^.Hedgehog^.Team^.voicepack);
+PlaySoundV(sndKamikaze, Gear^.Hedgehog^.Team^.voicepack);
 Gear^.doStep := @doStepKamikazeWork
 end
 end;
 procedure doStepKamikaze(Gear: PGear);
 if Gear^.Timer > 250 then
 begin
 Gear^.Timer := 0;
 inc(Gear^.Pos);
 if Gear^.Pos = 5 then
-PlaySound(sndYoohoo, Gear^.Hedgehog^.Team^.voicepack)
+PlaySoundV(sndYoohoo, Gear^.Hedgehog^.Team^.voicepack)
 end;
 if (Gear^.Pos = 14) and (RealTicks and $3 = 0) then
 begin
 heart:= AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtStraightShot);
 DrawTunnel(oX, oY, Gear^.dX, Gear^.dY, 2, 6);
 if (Gear^.Timer mod 30) = 0 then
 AddVisualGear(hwRound(Gear^.X + _20 * Gear^.dX), hwRound(Gear^.Y + _20 * Gear^.dY), vgtDust);
 if (CheckGearDrowning(Gear)) then
 begin
-StopSound(Gear^.SoundChannel);
+StopSoundChan(Gear^.SoundChannel);
 exit
 end
 end;
 if GameTicks > Gear^.FlightTime then
 or ( ((Gear^.State and gsttmpFlag) = 0) and (TestCollisionYWithGear(Gear, hwSign(Gear^.dY)) = 0) and (not TestCollisionXWithGear(Gear, hwSign(Gear^.dX))))
 // CheckLandValue returns true if the type isn't matched
 or (not CheckLandValue(hwRound(Gear^.X), hwRound(Gear^.Y), lfIndestructible)) then
 begin
 //out of time or exited ground
-StopSound(Gear^.SoundChannel);
+StopSoundChan(Gear^.SoundChannel);
 if (Gear^.State and gsttmpFlag) <> 0 then
 doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), 30, Gear^.Hedgehog, EXPLAutoSound)
 else
 doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), 50, Gear^.Hedgehog, EXPLAutoSound);
 DeleteGear(Gear);
 exit
 end
 else if (TestCollisionYWithGear(Gear, hwSign(Gear^.dY)) = 0) and (not TestCollisionXWithGear(Gear, hwSign(Gear^.dX))) then
 begin
-StopSound(Gear^.SoundChannel);
+StopSoundChan(Gear^.SoundChannel);
 Gear^.Tag := 1;
 Gear^.doStep := @doStepDrill
 end;
 dec(Gear^.Timer);
 CheckCollision(Gear);
 if ((Gear^.State and gstCollision) <> 0) or CheckGearDrowning(Gear) then
 begin
-StopSound(Gear^.SoundChannel);
+StopSoundChan(Gear^.SoundChannel);
 StopSound(sndRideOfTheValkyries);
 ResumeMusic;
 if ((Gear^.State and gstCollision) <> 0) then
 begin
 graves := GearsNear(Gear^.X, Gear^.Y, gtGrave, Gear^.Radius);
 if Length(graves) = 0 then
 begin
-StopSound(Gear^.SoundChannel);
+StopSoundChan(Gear^.SoundChannel);
 Gear^.Timer := 250;
 Gear^.doStep := @doStepIdle;
 exit;
 end;
 end;
 hh^.Gear^.dY := _0;
 hh^.Gear^.dX := _0;
 doStepHedgehogMoving(hh^.Gear);
-StopSound(Gear^.SoundChannel);
+StopSoundChan(Gear^.SoundChannel);
 Gear^.Timer := 250;
 Gear^.doStep := @doStepIdle;
 end
 //if hh^.Gear^.Health = 0 then doStepHedgehogFree(hh^.Gear);
 end;
 end;
 Gear^.doStep := @doStepResurrectorWork;
 end
 else
 begin
-StopSound(Gear^.SoundChannel);
+StopSoundChan(Gear^.SoundChannel);
 Gear^.Timer := 250;
 Gear^.doStep := @doStepIdle;
 end
 end;
 i,j,cnt: LongWord;
 begin
 HH:= Gear^.Hedgehog;
 if Gear^.Pos = 2 then
 begin
-StopSound(Gear^.SoundChannel);
+StopSoundChan(Gear^.SoundChannel);
 if (Gear^.Timer = 0) then
 begin
 if (HH^.Gear <> nil) and (HH^.Gear^.State and gstInvisible = 0) then
 begin
 AfterAttack;
 dec(Gear^.Power);
 if (Gear^.Pos = 1) and (Gear^.Power = 255) and ((GameTicks mod 2000) = 1000) then
 Gear^.Pos:= 2;
 if (Gear^.Pos = 3) and (Gear^.Power = 0) then
 begin
-StopSound(Gear^.SoundChannel);
+StopSoundChan(Gear^.SoundChannel);
 if HH^.GearHidden = nil then
 begin
 DeleteGear(Gear);
 exit
 end;

changeset 7053	8c9dcaedc7a8
parent 7036	d99934a827f0
child 7061	4e0fc59ab1ce