Wire up the settings panel

OpenRA.Game/GameRules/Settings.cs

@@ -81,17 +81,19 @@ namespace OpenRA.GameRules
 		public string LastServer = "localhost:1234";
 	}
 	
+	public enum MouseScrollType { Disabled, Standard, Inverted }
 	public class GameSettings
 	{
 		public string[] Mods = { "ra" };
 		public bool MatchTimer = true;
+		public bool ShellmapMusic = true;
 		
 		// Chat settings
 		public bool TeamChatToggle = false;
 
 		// Behaviour settings
         public bool ViewportEdgeScroll = true;
-        public bool InverseDragScroll = false;
+        public MouseScrollType MouseScroll = MouseScrollType.Standard;
 		public float ViewportEdgeScrollStep = 10f;
 
 		// Internal game settings

OpenRA.Game/Widgets/SliderWidget.cs

@@ -20,6 +20,9 @@ namespace OpenRA.Widgets
 		public Func<float> GetOffset;
 		public int Ticks = 0;
 		public int TrackHeight = 5;
+		
+		// TODO: Changing this breaks the semantics of Get/SetOffset
+		// This is bogus
 		public float2 Range = new float2(0f, 1f);
 		
 		private float Offset = 0;

OpenRA.Game/Widgets/ViewportScrollControllerWidget.cs

@@ -37,11 +37,15 @@ namespace OpenRA.Widgets
 		// TODO: ViewportScrollController doesn't support delegate methods for mouse input
 		public override bool HandleMouseInput(MouseInput mi)
 		{									
+			var scrolltype = Game.Settings.Game.MouseScroll;
+			if (scrolltype == OpenRA.GameRules.MouseScrollType.Disabled)
+				return false;
+			
 			if (mi.Event == MouseInputEvent.Move &&
 				(mi.Button == MouseButton.Middle || mi.Button == (MouseButton.Left | MouseButton.Right)))
 			{
-                int InverseScroll = Game.Settings.Game.InverseDragScroll ? -1 : 1;
-                Game.viewport.Scroll((Viewport.LastMousePos - mi.Location) * InverseScroll);
+                var d = scrolltype == OpenRA.GameRules.MouseScrollType.Inverted ? -1 : 1;
+                Game.viewport.Scroll((Viewport.LastMousePos - mi.Location) * d);
 				return true;
 			}
 			return false;