Timer Widget

Added a new Timer Widget
Made one to display the ingame time elapsed
Hooked up to reset on Game Start
Added a setting for it in Settings Menu (default true)

OpenRA.Game/GameRules/UserSettings.cs

@@ -35,6 +35,7 @@ namespace OpenRA.GameRules
 		public bool PerfDebug = false;
 		public bool IndexDebug = false;
 		public bool RecordSyncReports = true;
+		public bool ShowGameTimer = true;
 		
 		// Window settings
 		public WindowMode WindowMode = WindowMode.PseudoFullscreen;

OpenRA.Game/OpenRA.Game.csproj

@@ -230,6 +230,7 @@
     <Compile Include="Widgets\Delegates\MapChooserDelegate.cs" />
     <Compile Include="Widgets\ListBoxWidget.cs" />
     <Compile Include="Widgets\SliderWidget.cs" />
+    <Compile Include="Widgets\TimerWidget.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\OpenRA.FileFormats\OpenRA.FileFormats.csproj">

OpenRA.Game/Widgets/Delegates/IngameChromeDelegate.cs

@@ -29,6 +29,7 @@ namespace OpenRA.Widgets.Delegates
 			var optionsBG = gameRoot.GetWidget("INGAME_OPTIONS_BG");
 			
 			Game.OnGameStart += () => r.OpenWindow("INGAME_ROOT");
+			Game.OnGameStart += () => gameRoot.GetWidget<TimerWidget>("GAME_TIMER").Stopwatch.Reset();
 
 			r.GetWidget("INGAME_OPTIONS_BUTTON").OnMouseUp = mi => {
 				optionsBG.Visible = !optionsBG.Visible;

OpenRA.Game/Widgets/Delegates/SettingsMenuDelegate.cs

@@ -149,6 +149,14 @@ namespace OpenRA.Widgets.Delegates
 				return true;
 			};
 			
+			var timedebug = debug.GetWidget<CheckboxWidget>("GAMETIME_CHECKBOX");
+			timedebug.Checked = () => {return Game.Settings.ShowGameTimer;};
+			timedebug.OnMouseDown = mi => 
+			{
+				Game.Settings.ShowGameTimer ^= true;
+				return true;
+			};
+			
 			bg.GetWidget("BUTTON_CLOSE").OnMouseUp = mi => {
 				Game.Settings.Save();
 				Chrome.rootWidget.CloseWindow();

OpenRA.Game/Widgets/TimerWidget.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Drawing;
+using OpenRA.Support;
+
+namespace OpenRA.Widgets
+{
+	public class TimerWidget : Widget
+	{
+		public Stopwatch Stopwatch;
+		
+		public TimerWidget ()
+		{
+			Stopwatch = new Stopwatch();
+			IsVisible = () => Game.Settings.ShowGameTimer;
+		}
+		
+		public override void DrawInner (World world)
+		{			
+			var s = WorldUtils.FormatTime((int) Stopwatch.ElapsedTime() * 25);
+			var size = Game.chrome.renderer.RegularFont.Measure(s);
+			var padding = 5;
+			WidgetUtils.DrawPanel("dialog4",new Rectangle(RenderBounds.Top - padding, RenderBounds.Left - padding, size.X + 2*padding, size.Y + 2*padding));
+			Game.chrome.renderer.RegularFont.DrawText(s, new float2(RenderBounds.Top, RenderBounds.Left), Color.White);
+		}
+	}
+}
+

mods/cnc/chrome/ingame.yaml

@@ -5,6 +5,10 @@ Container@ROOT:
 			Delegate:IngameChromeDelegate
 			Visible:false
 			Children:
+				Timer@GAME_TIMER:
+					Id:GAME_TIMER
+					X: WINDOW_BOTTOM - 30
+					Y: 10
 				PostGame@POSTGAME_TEXT:
 					Id:POSTGAME_TEXT
 					X:0

mods/cnc/chrome/settings.yaml

@@ -213,4 +213,11 @@ Container@ROOT:
 							Y:120
 							Width:300
 							Height:20
-							Text:Show Spatial Index Debug
+							Text:Show Spatial Index Debug
+						Checkbox@GAMETIME_CHECKBOX:
+							Id:GAMETIME_CHECKBOX
+							X:0
+							Y:150
+							Width:300
+							Height:20
+							Text:Show Game Time Counter 

mods/ra/chrome/ingame.yaml

@@ -5,6 +5,10 @@ Container@ROOT:
 			Delegate:IngameChromeDelegate
 			Visible:false
 			Children:
+				Timer@GAME_TIMER:
+					Id:GAME_TIMER
+					X: WINDOW_BOTTOM - 30
+					Y: 10
 				PostGame@POSTGAME_TEXT:
 					Id:POSTGAME_TEXT
 					X:0

mods/ra/chrome/settings.yaml

@@ -213,4 +213,11 @@ Container@ROOT:
 							Y:120
 							Width:300
 							Height:20
-							Text:Show Spatial Index Debug
+							Text:Show Spatial Index Debug
+						Checkbox@GAMETIME_CHECKBOX:
+							Id:GAMETIME_CHECKBOX
+							X:0
+							Y:150
+							Width:300
+							Height:20
+							Text:Show Game Time Counter