Mercurial Mercurial > hedgewars / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hedgewars/uGearsHedgehog.pas
changeset 8632 b5ed76d2a1f9
parent 8631 796ed875aa95
child 8633 b9f5adfa81cc 
--- a/hedgewars/uGearsHedgehog.pas	Sun Mar 03 14:58:58 2013 -0500
+++ b/hedgewars/uGearsHedgehog.pas	Sun Mar 03 19:43:01 2013 -0500
@@ -1261,7 +1261,7 @@
 if GameTicks mod 100 = 0 then CheckIce(Gear);
 if Gear^.Hedgehog^.Effects[heFrozen] > 0 then 
     begin
-    if Gear^.Hedgehog^.Effects[heFrozen] > 256 then
+    if (Gear^.Hedgehog^.Effects[heFrozen] > 256) and (CurrentHedgehog^.Team^.Clan <> Gear^.Hedgehog^.Team^.Clan) then
         dec(Gear^.Hedgehog^.Effects[heFrozen])
     else if GameTicks mod 10 = 0 then
         dec(Gear^.Hedgehog^.Effects[heFrozen])
hedgewars