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

Merge pull request #11583 from Phrohdoh/fix-withtextdeco

Browse Source 
WithTextDecoration: Move exception to Info via IRulesetLoaded
This commit is contained in:
Matthias Mailänder
2016-07-06 22:46:26 +02:00
committed by GitHub
parent eae3808515 59d97b8447
commit 93b7847ce2
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRA.Mods.Common/Traits/Render/WithTextDecoration.cs
View File

@@ -20,7 +20,7 @@ using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits.Render namespace OpenRA.Mods.Common.Traits.Render
{ {
[Desc("Displays a text overlay relative to the selection box.")] [Desc("Displays a text overlay relative to the selection box.")]
public class WithTextDecorationInfo : UpgradableTraitInfo public class WithTextDecorationInfo : UpgradableTraitInfo, IRulesetLoaded
{ {
[FieldLoader.Require] [Translate] public readonly string Text = null; [FieldLoader.Require] [Translate] public readonly string Text = null;
@@ -46,6 +46,12 @@ namespace OpenRA.Mods.Common.Traits.Render
public readonly bool RequiresSelection = false; public readonly bool RequiresSelection = false;
public override object Create(ActorInitializer init) { return new WithTextDecoration(init.Self, this); } public override object Create(ActorInitializer init) { return new WithTextDecoration(init.Self, this); }
void IRulesetLoaded<ActorInfo>.RulesetLoaded(Ruleset rules, ActorInfo info)
{
if (!Game.ModData.Manifest.Fonts.ContainsKey(Font))
throw new YamlException("Font '{0}' is not listed in the mod.yaml's Fonts section".F(Font));
}
} }
public class WithTextDecoration : UpgradableTrait<WithTextDecorationInfo>, IRender, IPostRenderSelection, INotifyCapture public class WithTextDecoration : UpgradableTrait<WithTextDecorationInfo>, IRender, IPostRenderSelection, INotifyCapture
@@ -61,7 +67,7 @@ namespace OpenRA.Mods.Common.Traits.Render
this.self = self; this.self = self;
if (!Game.Renderer.Fonts.TryGetValue(info.Font, out font)) if (!Game.Renderer.Fonts.TryGetValue(info.Font, out font))
throw new YamlException("Could not find font '{0}'".F(info.Font)); throw new YamlException("Font '{0}' is not listed in the mod.yaml's Fonts section".F(info.Font));
color = Info.UsePlayerColor ? self.Owner.Color.RGB : Info.Color; color = Info.UsePlayerColor ? self.Owner.Color.RGB : Info.Color;
} }