# HG changeset patch
# User sheepluva
# Date 1416798988 -3600
# Node ID 339a005eab14306dfef3017516c373d063925584
# Parent  decba1e6099fba0c4985114627dfbc74bcde3288# Parent  d347ffa7e3723a479bd4590df01f9409378dfaf3
merge

diff -r decba1e6099f -r 339a005eab14 hedgewars/uGearsHandlersMess.pas
--- a/hedgewars/uGearsHandlersMess.pas	Mon Nov 24 04:14:06 2014 +0100
+++ b/hedgewars/uGearsHandlersMess.pas	Mon Nov 24 04:16:28 2014 +0100
@@ -3093,14 +3093,14 @@
         begin
         for i:= 0 to hogs.size - 1 do
             with hogs.ar^[i]^ do
-                begin
-                if hogs.ar^[i] <> CurrentHedgehog^.Gear then
+                if (hogs.ar^[i] <> CurrentHedgehog^.Gear) and (Hedgehog^.Effects[heFrozen] = 0)  then
                     begin
                     dX:= _50 * cGravity * (Gear^.X - X) / _25;
                     dY:= -_450 * cGravity;
                     Active:= true;
                     end
-                end;
+                else if Hedgehog^.Effects[heFrozen] > 255 then
+                    Hedgehog^.Effects[heFrozen]:= 255
         end ;
         AfterAttack;
         DeleteGear(Gear);