# HG changeset patch # User nemo # Date 1362580940 18000 # Node ID fcb87b74ea7ec25c5aa703191cedaa2349d191c1 # Parent b04a3724e3287a40b21433b6e81316fdb489c657# Parent 3f9853888d4f449fc998920f3d9f2e55e3450cc1 *sigh* I always forget to pull when AFK for a while. btw. why are we still keeping binaries in here? ☹ diff -r 3f9853888d4f -r fcb87b74ea7e hedgewars/GSHandlers.inc --- a/hedgewars/GSHandlers.inc Wed Mar 06 15:09:29 2013 +0100 +++ b/hedgewars/GSHandlers.inc Wed Mar 06 09:42:20 2013 -0500 @@ -5201,7 +5201,7 @@ if hogs.ar^[i]^.Hedgehog^.Effects[heFrozen] < 256 then hogs.ar^[i]^.Hedgehog^.Effects[heFrozen] := hogs.ar^[i]^.Hedgehog^.Effects[heFrozen] + 1 else if hogs.ar^[i]^.Hedgehog^.Effects[heFrozen] = 256 then - hogs.ar^[i]^.Hedgehog^.Effects[heFrozen]:= 150000;//cHedgehogTurnTime + cReadyDelay + hogs.ar^[i]^.Hedgehog^.Effects[heFrozen]:= 200000;//cHedgehogTurnTime + cReadyDelay end; inc(Pos) end diff -r 3f9853888d4f -r fcb87b74ea7e hedgewars/uTeams.pas --- a/hedgewars/uTeams.pas Wed Mar 06 15:09:29 2013 +0100 +++ b/hedgewars/uTeams.pas Wed Mar 06 09:42:20 2013 -0500 @@ -110,7 +110,7 @@ end; procedure SwitchHedgehog; -var c, i, j: LongWord; +var c: LongWord; PrevHH, PrevTeam : LongWord; begin TargetPoint.X:= NoPointX; @@ -173,15 +173,7 @@ if c = ClansCount then begin if not PlacingHogs then - begin inc(TotalRounds); - for i:= 0 to Pred(TeamsCount) do - with TeamsArray[i]^ do - for j:= 0 to Pred(HedgehogsNumber) do - with Hedgehogs[j] do - if Effects[heFrozen] > 255 then - Effects[heFrozen]:= max(255,Effects[heFrozen]-50000) - end; c:= 0 end; @@ -247,6 +239,13 @@ end; inc(CurrentTeam^.Clan^.TurnNumber); +with CurrentTeam^.Clan^ do + for t:= 0 to Pred(TeamsNumber) do + with Teams[t]^ do + for i:= 0 to Pred(HedgehogsNumber) do + with Hedgehogs[i] do + if Effects[heFrozen] > 255 then + Effects[heFrozen]:= max(255,Effects[heFrozen]-50000); CurWeapon:= GetCurAmmoEntry(CurrentHedgehog^); if CurWeapon^.Count = 0 then