From cc44139eb14e39ca3d442394f4cfb4ca04c8dcb1 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sun, 11 Aug 2013 12:42:35 +1200 Subject: [PATCH 1/2] Fix z-offset for muzzle flashes. Fixes #3667. --- OpenRA.Mods.RA/Render/WithMuzzleFlash.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OpenRA.Mods.RA/Render/WithMuzzleFlash.cs b/OpenRA.Mods.RA/Render/WithMuzzleFlash.cs index 91bcc97833..7bf24fe8ea 100644 --- a/OpenRA.Mods.RA/Render/WithMuzzleFlash.cs +++ b/OpenRA.Mods.RA/Render/WithMuzzleFlash.cs @@ -58,7 +58,8 @@ namespace OpenRA.Mods.RA.Render anims.Add(barrel, new AnimationWithOffset(muzzleFlash, () => arm.MuzzleOffset(self, barrel), - () => !visible[barrel])); + () => !visible[barrel], + p => WithTurret.ZOffsetFromCenter(self, p, 2))); } } From 18ae6aed2811f2da30e04583f5ec88ce80df59c4 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sun, 11 Aug 2013 12:46:50 +1200 Subject: [PATCH 2/2] Hide CashTicks under fog. Fixes #3664. --- OpenRA.Mods.RA/Effects/CashTick.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/OpenRA.Mods.RA/Effects/CashTick.cs b/OpenRA.Mods.RA/Effects/CashTick.cs index a1b5998211..8d924734e7 100644 --- a/OpenRA.Mods.RA/Effects/CashTick.cs +++ b/OpenRA.Mods.RA/Effects/CashTick.cs @@ -44,6 +44,9 @@ namespace OpenRA.Mods.RA.Effects public IEnumerable Render(WorldRenderer wr) { + if (wr.world.FogObscures(pos.ToCPos())) + yield break; + yield return new TextRenderable(font, pos, 0, color, text); } }