# HG changeset patch # User sheepluva # Date 1273137913 0 # Node ID 83cef0f08a869ce1e89ebf990507d9521a969476 # Parent e36dffdf7b82f121f964adf50bb98aab26d6a352 * get rid of some fpc hints (redundant/superfluous includes) * fix broken if causing segfault (whoops :D) diff -r e36dffdf7b82 -r 83cef0f08a86 hedgewars/hwengine.pas --- a/hedgewars/hwengine.pas Thu May 06 03:12:42 2010 +0000 +++ b/hedgewars/hwengine.pas Thu May 06 09:25:13 2010 +0000 @@ -46,17 +46,17 @@ uRandom in 'uRandom.pas', uAI in 'uAI.pas', uAIMisc in 'uAIMisc.pas', - uAIAmmoTests in 'uAIAmmoTests.pas', - uAIActions in 'uAIActions.pas', +// uAIAmmoTests in 'uAIAmmoTests.pas', +// uAIActions in 'uAIActions.pas', uCollisions in 'uCollisions.pas', uLand in 'uLand.pas', - uLandTemplates in 'uLandTemplates.pas', - uLandObjects in 'uLandObjects.pas', - uLandGraphics in 'uLandGraphics.pas', +// uLandTemplates in 'uLandTemplates.pas', +// uLandObjects in 'uLandObjects.pas', +// uLandGraphics in 'uLandGraphics.pas', uLocale in 'uLocale.pas', uAmmos in 'uAmmos.pas', - uSHA in 'uSHA.pas', - uFloat in 'uFloat.pas', +// uSHA in 'uSHA.pas', +// uFloat in 'uFloat.pas', uStats in 'uStats.pas', uChat in 'uChat.pas', uLandTexture in 'uLandTexture.pas', diff -r e36dffdf7b82 -r 83cef0f08a86 hedgewars/uGears.pas --- a/hedgewars/uGears.pas Thu May 06 03:12:42 2010 +0000 +++ b/hedgewars/uGears.pas Thu May 06 09:25:13 2010 +0000 @@ -515,9 +515,10 @@ // make sure that portals have their link removed before deletion if (Gear^.Kind = gtPortal) then + begin if (Gear^.IntersectGear <> nil) then - Gear^.IntersectGear^.IntersectGear:= nil - + Gear^.IntersectGear^.IntersectGear:= nil; + end else if Gear^.Kind = gtHedgehog then if (CurAmmoGear <> nil) and (CurrentHedgehog^.Gear = Gear) then begin