# HG changeset patch # User nemo # Date 1674268837 18000 # Node ID 4c0f8dbf6c13d5d4fc1c57323595f4b1a7ea3478 # Parent 73cdc306888fa98d55ff6aced04ebd59b8fe3c6d# Parent 1becf4a0e90718313fd5748fa12bb01ab943dbe7 merge to trunk diff -r 73cdc306888f -r 4c0f8dbf6c13 hedgewars/uGearsHandlersMess.pas --- a/hedgewars/uGearsHandlersMess.pas Tue Dec 13 21:21:55 2022 +0100 +++ b/hedgewars/uGearsHandlersMess.pas Fri Jan 20 21:40:37 2023 -0500 @@ -264,6 +264,7 @@ procedure HideHog(HH: PHedgehog); begin + if HH^.Gear = nil then exit; ScriptCall('onHogHide', HH^.Gear^.Uid); DeleteCI(HH^.Gear); if FollowGear = HH^.Gear then diff -r 73cdc306888f -r 4c0f8dbf6c13 hedgewars/uScript.pas --- a/hedgewars/uScript.pas Tue Dec 13 21:21:55 2022 +0100 +++ b/hedgewars/uScript.pas Fri Jan 20 21:40:37 2023 -0500 @@ -3225,7 +3225,7 @@ if CheckLuaParamCount(L, 1, 'HideHog', 'gearUid') then begin gear:= GearByUID(Trunc(lua_tonumber(L, 1))); - if (gear <> nil) and (gear^.hedgehog <> nil) then + if (gear <> nil) and (gear^.hedgehog <> nil) and (gear^.hedgehog^.gear <> nil) then begin HideHog(gear^.hedgehog); lua_pushboolean(L, true);