merge
authorunc0rr
Thu, 06 Mar 2014 00:19:50 +0400
changeset 10179 26c4256a9e4b
parent 10177 0f9042536c46 (current diff)
parent 10178 949b51ca18c6 (diff)
child 10180 8d4bb51bf5cb
merge
--- a/hedgewars/uGearsHedgehog.pas	Thu Mar 06 00:18:51 2014 +0400
+++ b/hedgewars/uGearsHedgehog.pas	Thu Mar 06 00:19:50 2014 +0400
@@ -606,6 +606,7 @@
 procedure doStepHedgehogGone(Gear: PGear);
 const frametime = 65;
       timertime = frametime * 11;
+var i: LongInt;
 begin
 if Gear^.Hedgehog^.Unplaced then
     exit;
@@ -628,8 +629,20 @@
     Gear^.Z:= cCurrHHZ;
     RemoveGearFromList(Gear);
     InsertGearToList(Gear);
-    PlaySoundV(sndByeBye, Gear^.Hedgehog^.Team^.voicepack);
-    PlaySound(sndWarp);
+    // only play sound for one alive hedgehog
+    with Gear^.Hedgehog^.Team^ do
+        for i:= 0 to cMaxHHIndex do
+            begin
+            if (Hedgehogs[i].Gear <> nil) then
+                begin
+                if (Hedgehogs[i].Gear = Gear) then
+                    begin
+                    PlaySoundV(sndByeBye, Gear^.Hedgehog^.Team^.voicepack);
+                    PlaySound(sndWarp);
+                    end;
+                break;
+                end;
+            end;
     Gear^.Pos:= 0;
     Gear^.Timer:= timertime
     end