From 2d0028396ab729b9e5c35c883b6f781c1442a917 Mon Sep 17 00:00:00 2001
From: Paul Chote <paul@chote.net>
Date: Sun, 6 Oct 2013 11:04:15 +1300
Subject: [PATCH] Fix DefaultLoadScreen coding style.

---
 OpenRA.Mods.RA/DefaultLoadScreen.cs | 53 +++++++++++++++--------------
 1 file changed, 27 insertions(+), 26 deletions(-)

diff --git a/OpenRA.Mods.RA/DefaultLoadScreen.cs b/OpenRA.Mods.RA/DefaultLoadScreen.cs
index 09ab6f88a3..a1f1f1e79d 100644
--- a/OpenRA.Mods.RA/DefaultLoadScreen.cs
+++ b/OpenRA.Mods.RA/DefaultLoadScreen.cs
@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2013 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
  * as published by the Free Software Foundation. For more information,
@@ -20,29 +20,31 @@ namespace OpenRA.Mods.RA
 {
 	public class DefaultLoadScreen : ILoadScreen
 	{
-		Dictionary<string, string> Info;
-
-		Stopwatch lastLoadScreen = new Stopwatch();
-
-		Rectangle StripeRect;
-		Sprite Stripe, Logo;
-		float2 LogoPos;
-
+		Dictionary<string, string> info;
+		Stopwatch lastUpdate = new Stopwatch();
 		Renderer r;
 
+		Rectangle stripeRect;
+		float2 logoPos;
+		Sprite stripe, logo;
+		string[] messages;
+
 		public void Init(Dictionary<string, string> info)
 		{
-			Info = info;
+			this.info = info;
+
 			// Avoid standard loading mechanisms so we
 			// can display the loadscreen as early as possible
 			r = Game.Renderer;
-			if (r == null) return;
+			if (r == null)
+				return;
 
-			var s = new Sheet(Info["Image"]);
-			Logo = new Sprite(s, new Rectangle(0,0,256,256), TextureChannel.Alpha);
-			Stripe = new Sprite(s, new Rectangle(256,0,256,256), TextureChannel.Alpha);
-			StripeRect = new Rectangle(0, r.Resolution.Height/2 - 128, r.Resolution.Width, 256);
-			LogoPos =  new float2(r.Resolution.Width/2 - 128, r.Resolution.Height/2 - 128);
+			messages = info["Text"].Split(',');
+			var s = new Sheet(info["Image"]);
+			logo = new Sprite(s, new Rectangle(0, 0, 256, 256), TextureChannel.Alpha);
+			stripe = new Sprite(s, new Rectangle(256, 0, 256, 256), TextureChannel.Alpha);
+			stripeRect = new Rectangle(0, r.Resolution.Height / 2 - 128, r.Resolution.Width, 256);
+			logoPos = new float2(r.Resolution.Width / 2 - 128, r.Resolution.Height / 2 - 128);
 		}
 
 		public void Display()
@@ -51,21 +53,21 @@ namespace OpenRA.Mods.RA
 				return;
 
 			// Update text at most every 0.5 seconds
-			if (lastLoadScreen.ElapsedTime() < 0.5)
+			if (lastUpdate.ElapsedTime() < 0.5)
 				return;
 
 			if (r.Fonts == null)
 				return;
 
-			lastLoadScreen.Reset();
-			var text = Info["Text"].Split(',').Random(Game.CosmeticRandom);
+			lastUpdate.Reset();
+			var text = messages.Random(Game.CosmeticRandom);
 			var textSize = r.Fonts["Bold"].Measure(text);
 
 			r.BeginFrame(float2.Zero, 1f);
-			WidgetUtils.FillRectWithSprite(StripeRect, Stripe);
-			r.RgbaSpriteRenderer.DrawSprite(Logo, LogoPos);
+			WidgetUtils.FillRectWithSprite(stripeRect, stripe);
+			r.RgbaSpriteRenderer.DrawSprite(logo, logoPos);
 			r.Fonts["Bold"].DrawText(text, new float2(r.Resolution.Width - textSize.X - 20, r.Resolution.Height - textSize.Y - 20), Color.White);
-			r.EndFrame( new NullInputHandler() );
+			r.EndFrame(new NullInputHandler());
 		}
 
 		public void StartGame()
@@ -76,18 +78,17 @@ namespace OpenRA.Mods.RA
 		void TestAndContinue()
 		{
 			Ui.ResetAll();
-			if (!FileSystem.Exists(Info["TestFile"]))
+			if (!FileSystem.Exists(info["TestFile"]))
 			{
 				var args = new WidgetArgs()
 				{
 					{ "continueLoading", () => TestAndContinue() },
-					{ "installData", Info }
+					{ "installData", info }
 				};
-				Ui.OpenWindow(Info["InstallerMenuWidget"], args);
+				Ui.OpenWindow(info["InstallerMenuWidget"], args);
 			}
 			else
 				Game.LoadShellMap();
 		}
 	}
 }
-