epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't crash when the fonts are not yet loaded

Browse Source 
closes #3157
This commit is contained in:
Matthias Mailänder
2013-04-27 09:52:53 +02:00
parent 7ec4bcad0e
commit 7bd253d56b
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.Cnc/CncLoadScreen.cs
View File

@@ -86,7 +86,7 @@ namespace OpenRA.Mods.Cnc
WidgetUtils.DrawPanelPartial(ss, Bounds, PanelSides.Edges); WidgetUtils.DrawPanelPartial(ss, Bounds, PanelSides.Edges);
var barY = Bounds.Height - 78; var barY = Bounds.Height - 78;
if (!setup) if (!setup && r.Fonts != null)
{ {
loadingFont = r.Fonts["BigBold"]; loadingFont = r.Fonts["BigBold"];
loadingText = "Loading"; loadingText = "Loading";
@@ -100,7 +100,9 @@ namespace OpenRA.Mods.Cnc
setup = true; setup = true;
} }
if (loadingFont != null)
loadingFont.DrawText(loadingText, loadingPos, Color.Gray); loadingFont.DrawText(loadingText, loadingPos, Color.Gray);
if (versionFont != null)
versionFont.DrawTextWithContrast(versionText, versionPos, Color.White, Color.Black, 2); versionFont.DrawTextWithContrast(versionText, versionPos, Color.White, Color.Black, 2);
for (var i = 0; i <= 8; i++) for (var i = 0; i <= 8; i++)

3
OpenRA.Mods.D2k/D2kLoadScreen.cs
View File

@@ -53,6 +53,9 @@ namespace OpenRA.Mods.D2k
if (lastLoadScreen.ElapsedTime() < 0.5) if (lastLoadScreen.ElapsedTime() < 0.5)
return; return;
if (r.Fonts == null)
return;
lastLoadScreen.Reset(); lastLoadScreen.Reset();
var text = Comments.Random(Game.CosmeticRandom); var text = Comments.Random(Game.CosmeticRandom);
var textSize = r.Fonts["Bold"].Measure(text); var textSize = r.Fonts["Bold"].Measure(text);

3
OpenRA.Mods.RA/RALoadScreen.cs
View File

@@ -57,6 +57,9 @@ namespace OpenRA.Mods.RA
if (lastLoadScreen.ElapsedTime() < 0.5) if (lastLoadScreen.ElapsedTime() < 0.5)
return; return;
if (r.Fonts == null)
return;
lastLoadScreen.Reset(); lastLoadScreen.Reset();
var text = Comments.Random(Game.CosmeticRandom); var text = Comments.Random(Game.CosmeticRandom);
var textSize = r.Fonts["Bold"].Measure(text); var textSize = r.Fonts["Bold"].Measure(text);