diff --git a/OpenRA.Mods.Common/Effects/Contrail.cs b/OpenRA.Mods.Common/Effects/Contrail.cs index 8a9c32b495..04c952c488 100644 --- a/OpenRA.Mods.Common/Effects/Contrail.cs +++ b/OpenRA.Mods.Common/Effects/Contrail.cs @@ -61,7 +61,7 @@ namespace OpenRA.Mods.Common.Effects public IEnumerable Render(Actor self, WorldRenderer wr) { - yield return trail; + return new IRenderable[] { trail }; } } } diff --git a/OpenRA.Mods.Common/Traits/Render/RenderNameTag.cs b/OpenRA.Mods.Common/Traits/Render/RenderNameTag.cs index 2683c5744c..839fcff764 100644 --- a/OpenRA.Mods.Common/Traits/Render/RenderNameTag.cs +++ b/OpenRA.Mods.Common/Traits/Render/RenderNameTag.cs @@ -51,7 +51,7 @@ namespace OpenRA.Mods.Common.Traits var spaceBuffer = (int)(10 / wr.Viewport.Zoom); var effectPos = wr.ProjectedPosition(new int2(pos.X, bounds.Y - spaceBuffer)); - yield return new TextRenderable(font, effectPos, 0, color, name); + return new IRenderable[] { new TextRenderable(font, effectPos, 0, color, name) }; } } } diff --git a/OpenRA.Mods.Common/Traits/Render/RenderVoxels.cs b/OpenRA.Mods.Common/Traits/Render/RenderVoxels.cs index c37640100f..243963c12d 100644 --- a/OpenRA.Mods.Common/Traits/Render/RenderVoxels.cs +++ b/OpenRA.Mods.Common/Traits/Render/RenderVoxels.cs @@ -103,10 +103,10 @@ namespace OpenRA.Mods.Common.Traits initializePalettes = false; } - yield return new VoxelRenderable( + return new IRenderable[] { new VoxelRenderable( components, self.CenterPosition, 0, camera, info.Scale, lightSource, info.LightAmbientColor, info.LightDiffuseColor, - colorPalette, normalsPalette, shadowPalette); + colorPalette, normalsPalette, shadowPalette) }; } public string Image { get { return info.Image ?? self.Info.Name; } } diff --git a/OpenRA.Mods.Common/Traits/Render/WithParachute.cs b/OpenRA.Mods.Common/Traits/Render/WithParachute.cs index 55f0a6ac4c..984722515f 100644 --- a/OpenRA.Mods.Common/Traits/Render/WithParachute.cs +++ b/OpenRA.Mods.Common/Traits/Render/WithParachute.cs @@ -134,20 +134,20 @@ namespace OpenRA.Mods.Common.Traits public IEnumerable Render(Actor self, WorldRenderer wr) { if (info.ShadowImage == null) - yield break; + return Enumerable.Empty(); if (IsTraitDisabled) - yield break; + return Enumerable.Empty(); if (self.IsDead || !self.IsInWorld) - yield break; + return Enumerable.Empty(); if (self.World.FogObscures(self)) - yield break; + return Enumerable.Empty(); shadow.Tick(); var pos = self.CenterPosition - new WVec(0, 0, self.CenterPosition.Z); - yield return new SpriteRenderable(shadow.Image, pos, info.ShadowOffset, info.ShadowZOffset, wr.Palette(info.ShadowPalette), 1, true); + return new IRenderable[] { new SpriteRenderable(shadow.Image, pos, info.ShadowOffset, info.ShadowZOffset, wr.Palette(info.ShadowPalette), 1, true) }; } } }