hedgewars/uScript.pas
changeset 10581 f0b4c14a3c62
parent 10560 9f09196d92a6
child 10589 98ea597e5cd9
--- a/hedgewars/uScript.pas	Sat Nov 29 15:30:33 2014 -0500
+++ b/hedgewars/uScript.pas	Sat Nov 29 21:29:11 2014 -0500
@@ -1027,7 +1027,9 @@
 begin
     if CheckLuaParamCount(L, 2, 'SetClanColor', 'clan, color') then
         begin
-        clan := ClansArray[lua_tointeger(L, 1)];
+	i:= lua_tointeger(L,1);
+	if i >= ClansCount then exit(0);
+        clan := ClansArray[i];
         clan^.Color:= lua_tointeger(L, 2) shr 8;
 
         for i:= 0 to Pred(clan^.TeamsNumber) do
@@ -1047,6 +1049,7 @@
             team^.NameTagTex:= RenderStringTex(ansistring(clan^.Teams[i]^.TeamName), clan^.Color, fnt16);
             end;
 
+	FreeTexture(clan^.HealthTex);
         clan^.HealthTex:= makeHealthBarTexture(cTeamHealthWidth + 5, clan^.Teams[0]^.NameTagTex^.h, clan^.Color);
         end;