From 554032ad5f41f80b3738bba7ea404f6d0924d1c7 Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Tue, 4 Oct 2011 22:40:46 +1300 Subject: [PATCH] allow null player in RenderSimple.RenderPreview in prep for editor usage --- OpenRA.Game/Traits/Render/RenderSimple.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OpenRA.Game/Traits/Render/RenderSimple.cs b/OpenRA.Game/Traits/Render/RenderSimple.cs index e9465ab1ff..1b2d4ff6c7 100755 --- a/OpenRA.Game/Traits/Render/RenderSimple.cs +++ b/OpenRA.Game/Traits/Render/RenderSimple.cs @@ -27,7 +27,8 @@ namespace OpenRA.Traits { var anim = new Animation(RenderSimple.GetImage(building), () => 0); anim.PlayRepeating("idle"); - yield return new Renderable(anim.Image, 0.5f * anim.Image.size * (1 - Scale), Palette ?? PlayerPalette + owner.InternalName, 0, Scale); + yield return new Renderable(anim.Image, 0.5f * anim.Image.size * (1 - Scale), + Palette ?? (owner != null ? PlayerPalette + owner.InternalName : null), 0, Scale); } }