Merge
authorunc0rr
Mon, 19 Nov 2012 10:38:02 +0400
changeset 8066 1a61fe7c160d
parent 8065 609d07b337b5 (current diff)
parent 8061 c08e9c3e0737 (diff)
child 8067 34a679e5ca9d
Merge
--- a/hedgewars/GSHandlers.inc	Mon Nov 19 03:29:41 2012 +0100
+++ b/hedgewars/GSHandlers.inc	Mon Nov 19 10:38:02 2012 +0400
@@ -2456,6 +2456,12 @@
         Gear^.AdvBounce:= 1;
 
     HHGear := Gear^.Hedgehog^.Gear;
+    if HHGear = nil then
+        begin
+        DeleteGear(Gear);
+        exit
+        end;
+
     HHGear^.State := HHGear^.State or gstNoDamage;
     DeleteCI(HHGear);