# HG changeset patch # User nemo # Date 1327424093 18000 # Node ID 4c06ea12de1cd42fe837bcbd477f1e80b1251100 # Parent f567d52183ec178db641b9dec6a16dd98025f596 Tweak voices a bit (always play hurry at correct time, skip "come on then" if other voice is playing) diff -r f567d52183ec -r 4c06ea12de1c hedgewars/uGears.pas --- a/hedgewars/uGears.pas Tue Jan 24 03:38:18 2012 +0100 +++ b/hedgewars/uGears.pas Tue Jan 24 11:54:53 2012 -0500 @@ -418,10 +418,10 @@ and (not PlacingHogs) and (CurrentHedgehog^.Gear <> nil) and ((CurrentHedgehog^.Gear^.State and gstAttacked) = 0) then - AddVoice(sndHurry, CurrentTeam^.voicepack); + PlaySound(sndHurry, CurrentTeam^.voicepack); if ReadyTimeLeft > 0 then begin - if ReadyTimeLeft = 2000 then + if (ReadyTimeLeft = 2000) and (LastVoice.snd = sndNone) then AddVoice(sndComeonthen, CurrentTeam^.voicepack); dec(ReadyTimeLeft) end