From 1b0724719d5df6a5ad60eb113db6e3193d0b7727 Mon Sep 17 00:00:00 2001
From: alzeih <alzeih@gmail.com>
Date: Tue, 13 Dec 2011 22:59:32 +1300
Subject: [PATCH] Make LineRenderer understand Zoom internally

---
 OpenRA.Game/Graphics/LineRenderer.cs | 2 +-
 OpenRA.Game/Graphics/Renderer.cs     | 2 --
 OpenRA.Mods.RA/Effects/LaserZap.cs   | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/OpenRA.Game/Graphics/LineRenderer.cs b/OpenRA.Game/Graphics/LineRenderer.cs
index fb47eafb2a..a3ede4fa10 100644
--- a/OpenRA.Game/Graphics/LineRenderer.cs
+++ b/OpenRA.Game/Graphics/LineRenderer.cs
@@ -38,7 +38,7 @@ namespace OpenRA.Graphics
 				{
 					var vb = renderer.GetTempVertexBuffer();
 					vb.SetData( vertices, nv );
-					renderer.SetLineWidth(LineWidth);
+					renderer.SetLineWidth(LineWidth * Game.viewport.Zoom);
 					renderer.DrawBatch( vb,	0, nv, PrimitiveType.LineList );
 				} );
 
diff --git a/OpenRA.Game/Graphics/Renderer.cs b/OpenRA.Game/Graphics/Renderer.cs
index 1963bbfd57..7419dc3b33 100644
--- a/OpenRA.Game/Graphics/Renderer.cs
+++ b/OpenRA.Game/Graphics/Renderer.cs
@@ -76,8 +76,6 @@ namespace OpenRA.Graphics
 		public void BeginFrame(float2 scroll, float zoom)
 		{
 			device.Clear();
-
-			WorldLineRenderer.LineWidth = zoom;
 			float2 r1 = new float2(2f/Resolution.Width, -2f/Resolution.Height);
 			float2 r2 = new float2(-1, 1);
 			var zr1 = zoom*r1;
diff --git a/OpenRA.Mods.RA/Effects/LaserZap.cs b/OpenRA.Mods.RA/Effects/LaserZap.cs
index 0ce7e9f687..7111bf8c4d 100755
--- a/OpenRA.Mods.RA/Effects/LaserZap.cs
+++ b/OpenRA.Mods.RA/Effects/LaserZap.cs
@@ -86,7 +86,7 @@ namespace OpenRA.Mods.RA.Effects
 			var rc = Color.FromArgb((info.BeamDuration - ticks)*255/info.BeamDuration, color);
 
 			var wlr = Game.Renderer.WorldLineRenderer;
-			wlr.LineWidth = info.BeamRadius * 2 * Game.viewport.Zoom;
+			wlr.LineWidth = info.BeamRadius * 2;
 			wlr.DrawLine(args.src, args.dest, rc, rc);
 		}
 	}