hedgewars/uCollisions.pas
branchqmlfrontend
changeset 10748 dc587913987c
parent 10635 8e8b320eefad
child 10818 f642a28cab0c
--- a/hedgewars/uCollisions.pas	Thu Dec 18 00:03:53 2014 +0300
+++ b/hedgewars/uCollisions.pas	Sat Jan 03 23:46:26 2015 +0300
@@ -97,7 +97,7 @@
 if Gear^.CollisionIndex >= 0 then
     begin
     with cinfos[Gear^.CollisionIndex] do
-        ChangeRoundInLand(X, Y, Radius - 1, false, (Gear = CurrentHedgehog^.Gear) or ((Gear^.Kind = gtCase) and (Gear^.State and gstFrozen = 0)));
+        ChangeRoundInLand(X, Y, Radius - 1, false, ((CurrentHedgehog <> nil) and (Gear = CurrentHedgehog^.Gear)) or ((Gear^.Kind = gtCase) and (Gear^.State and gstFrozen = 0)));
     cinfos[Gear^.CollisionIndex]:= cinfos[Pred(Count)];
     cinfos[Gear^.CollisionIndex].cGear^.CollisionIndex:= Gear^.CollisionIndex;
     Gear^.CollisionIndex:= -1;