From c3532fc9ea40621be16a73f6045ecc57270b0412 Mon Sep 17 00:00:00 2001
From: alzeih <alzeih@gmail.com>
Date: Wed, 14 Jul 2010 14:19:28 +1200
Subject: [PATCH] Change Settings defaults

---
 OpenRA.Game/GameRules/UserSettings.cs                | 12 +++++++-----
 .../Widgets/Delegates/SettingsMenuDelegate.cs        |  8 ++++++--
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/OpenRA.Game/GameRules/UserSettings.cs b/OpenRA.Game/GameRules/UserSettings.cs
index 518c78558e..cbfe68f372 100644
--- a/OpenRA.Game/GameRules/UserSettings.cs
+++ b/OpenRA.Game/GameRules/UserSettings.cs
@@ -23,6 +23,7 @@ using OpenRA.FileFormats.Graphics;
 using System.IO;
 using System.Collections.Generic;
 using System.Drawing;
+using System.Windows.Forms;
 
 namespace OpenRA.GameRules
 {
@@ -30,20 +31,21 @@ namespace OpenRA.GameRules
 	{
 		// Debug settings
 		public bool UnitDebug = false;
-		public bool PathDebug = true;
-		public bool PerfDebug = true;
+		public bool PathDebug = false;
+		public bool PerfDebug = false;
 		public bool IndexDebug = false;
 		public bool RecordSyncReports = true;
 		
 		// Window settings
 		public WindowMode WindowMode = WindowMode.PseudoFullscreen;
-		public int2 FullscreenSize = new int2(0,0);
+		public int2 FullscreenSize = new int2(Screen.PrimaryScreen.Bounds.Width,Screen.PrimaryScreen.Bounds.Height);
 		public int2 WindowedSize = new int2(1024,768);
+		public readonly static int2 MinResolution = new int2(800, 600);
 		
 		//Sound Settings
 		public float SoundVolume = 0.5f;
 		public float MusicVolume = 0.5f;
-		public bool MusicPlayer = true;
+		public bool MusicPlayer = false;
 		
 		// Internal game settings
 		public int Timestep = 40;
@@ -52,7 +54,7 @@ namespace OpenRA.GameRules
 		// External game settings
 		public string LastServer = "localhost:1234";
 		public string Replay = null;
-		public string PlayerName = null;
+		public string PlayerName = "Newbie";
 		public string[] InitialMods = { "ra" };
 
 		// Server settings
diff --git a/OpenRA.Game/Widgets/Delegates/SettingsMenuDelegate.cs b/OpenRA.Game/Widgets/Delegates/SettingsMenuDelegate.cs
index 3d7fecee02..7c7ffed3de 100644
--- a/OpenRA.Game/Widgets/Delegates/SettingsMenuDelegate.cs
+++ b/OpenRA.Game/Widgets/Delegates/SettingsMenuDelegate.cs
@@ -69,12 +69,14 @@ namespace OpenRA.Widgets.Delegates
 			};
 			
 			var width = display.GetWidget<TextFieldWidget>("SCREEN_WIDTH");
+			Game.Settings.WindowedSize.X = (Game.Settings.WindowedSize.X < Game.Settings.MinResolution.X)?
+				Game.Settings.MinResolution.X : Game.Settings.WindowedSize.X;
 			width.Text = Game.Settings.WindowedSize.X.ToString();
 			width.OnLoseFocus = () =>
 			{
 				try {
 					var w = int.Parse(width.Text);
-					if (w > 800 && w <= Screen.PrimaryScreen.Bounds.Size.Width)
+					if (w > Game.Settings.MinResolution.X && w <= Screen.PrimaryScreen.Bounds.Size.Width)
 						Game.Settings.WindowedSize = new int2(w, Game.Settings.WindowedSize.Y);
 					else
 						width.Text = Game.Settings.WindowedSize.X.ToString();
@@ -86,12 +88,14 @@ namespace OpenRA.Widgets.Delegates
 			width.OnEnterKey = () => { width.LoseFocus(); return true; };
 			
 			var height = display.GetWidget<TextFieldWidget>("SCREEN_HEIGHT");
+			Game.Settings.WindowedSize.Y = (Game.Settings.WindowedSize.Y < Game.Settings.MinResolution.Y)?
+				Game.Settings.MinResolution.Y : Game.Settings.WindowedSize.Y;
 			height.Text = Game.Settings.WindowedSize.Y.ToString();
 			height.OnLoseFocus = () =>
 			{
 				try {
 					var h = int.Parse(height.Text);
-					if (h > 600  && h <= Screen.PrimaryScreen.Bounds.Size.Height)
+					if (h > Game.Settings.MinResolution.Y  && h <= Screen.PrimaryScreen.Bounds.Size.Height)
 						Game.Settings.WindowedSize = new int2(Game.Settings.WindowedSize.X, h);	
 					else 
 						height.Text = Game.Settings.WindowedSize.Y.ToString();