# HG changeset patch # User Wuzzy # Date 1548051059 -3600 # Node ID 9e7092e5990a3b3cd4ca2123572da0c18e3d86a4 # Parent 5fc5e4b79a5a9653f708b0e4512cfea8cfb50cd3 Simplify code for SetClanColor diff -r 5fc5e4b79a5a -r 9e7092e5990a hedgewars/uScript.pas --- a/hedgewars/uScript.pas Mon Jan 21 06:48:12 2019 +0100 +++ b/hedgewars/uScript.pas Mon Jan 21 07:10:59 2019 +0100 @@ -1358,8 +1358,7 @@ function lc_setclancolor(L : Plua_State) : LongInt; Cdecl; var clan : PClan; team : PTeam; - hht : THedgehog; - hhp : PHedgehog; + hh : THedgehog; i, j : LongInt; colorArg: Int64; color: LongWord; @@ -1390,17 +1389,13 @@ team:= clan^.Teams[i]; for j:= 0 to cMaxHHIndex do begin - hht:= team^.Hedgehogs[j]; - hhp:= nil; - if (hht.Gear <> nil) then - hhp:= team^.Hedgehogs[j].Gear^.Hedgehog - else if (hht.GearHidden <> nil) then - hhp:= team^.Hedgehogs[j].GearHidden^.Hedgehog; - if (hhp <> nil) then + hh:= team^.Hedgehogs[j]; + if (hh.Gear <> nil) or (hh.GearHidden <> nil) then begin - FreeAndNilTexture(hhp^.NameTagTex); - hhp^.NameTagTex:= RenderStringTex(ansistring(hhp^.Name), clan^.Color, fnt16); - RenderHealth(hhp^); + FreeAndNilTexture(hh.NameTagTex); + hh.NameTagTex:= RenderStringTex(ansistring(hh.Name), clan^.Color, fnt16); + RenderHealth(hh); + team^.Hedgehogs[j]:= hh; end; end; FreeAndNilTexture(team^.NameTagTex);