Pull in more changes from master.

This commit is contained in:
Mari the Deer 2021-10-03 23:49:20 +02:00
commit 8be723477f
15 changed files with 147 additions and 24 deletions

View file

@ -37,6 +37,12 @@ Class SWWMCreditsEntry ui
return self;
}
override void OnDestroy()
{
Super.OnDestroy();
if ( btext ) btext.Destroy();
}
private int CalcWidth()
{
int len = fnt.StringWidth(title);

View file

@ -187,6 +187,7 @@ Class SWWMHelpMenu : GenericMenu
Screen.DrawText(fnt,Font.CR_WHITE,origin.x+320-maxlen/2,origin.y+133-lh/2+y,l.StringAt(i),DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true,DTA_Alpha,alpha);
y += h;
}
l.Destroy();
return;
}
txt = String.Format("(Unknown help page #%d)",page);

View file

@ -161,6 +161,7 @@ Class SWWMStatScreen : StatusScreen abstract
yy += fnt.GetHeight();
xx = 12;
}
l.Destroy();
}
override int DrawLF()
{