Mercurial Mercurial > hedgewars / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from 0.9.18
authorunc0rr
Sun, 18 Nov 2012 23:10:26 +0400
changeset 8061 c08e9c3e0737
parent 8060 341fa76d0749 (current diff)
parent 7958 c031c3e2eb2a (diff)
child 8066 1a61fe7c160d
Merge from 0.9.18
hedgewars/GSHandlers.inc file | annotate | diff | comparison | revisions 
--- a/hedgewars/GSHandlers.inc	Sun Nov 18 18:58:46 2012 +0400
+++ b/hedgewars/GSHandlers.inc	Sun Nov 18 23:10:26 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);
hedgewars