From b1dc5012c3494af6f3cc9d17a5119cfe784d4869 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sun, 10 May 2015 11:56:01 +0100 Subject: [PATCH] =?UTF-8?q?Don=E2=80=99t=20crash=20if=20IQBO=20isn?= =?UTF-8?q?=E2=80=99t=20present=20on=20an=20actor.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OpenRA.Mods.Common/Traits/Render/RenderSprites.cs | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/OpenRA.Mods.Common/Traits/Render/RenderSprites.cs b/OpenRA.Mods.Common/Traits/Render/RenderSprites.cs index c81f43a3fc..36f5ee47cd 100644 --- a/OpenRA.Mods.Common/Traits/Render/RenderSprites.cs +++ b/OpenRA.Mods.Common/Traits/Render/RenderSprites.cs @@ -64,9 +64,15 @@ namespace OpenRA.Mods.Common.Traits var facings = 0; var body = init.Actor.Traits.GetOrDefault(); if (body != null) - facings = body.QuantizedFacings == -1 ? - init.Actor.Traits.Get().QuantizedBodyFacings(init.Actor, sequenceProvider, race) : - body.QuantizedFacings; + { + facings = body.QuantizedFacings; + + if (facings == -1) + { + var qbo = init.Actor.Traits.GetOrDefault(); + facings = qbo != null ? qbo.QuantizedBodyFacings(init.Actor, sequenceProvider, race) : 1; + } + } foreach (var spi in init.Actor.Traits.WithInterface()) foreach (var preview in spi.RenderPreviewSprites(init, this, image, facings, palette))