Maps as packages. Disable broken map selector.

OpenRA.Game/Chrome.cs

@@ -258,7 +258,7 @@ namespace OpenRA
 			}
 				
 		}
-
+		/*
 		class MapInfo
 		{
 			public readonly string Filename;
@@ -278,11 +278,12 @@ namespace OpenRA
 				var mapsFolderMaps = Directory.GetFiles("maps/");
 				return builtinMaps.Concat(mapsFolderMaps).Select(a => new MapInfo(a)).ToList();
 			});
-
+		
+		
 		bool showMapChooser = false;
 		MapInfo currentMap;
 		bool mapPreviewDirty = true;
-
+		*/
 		void AddUiButton(int2 pos, string text, Action<bool> a)
 		{
 			var rect = new Rectangle(pos.X - 160 / 2, pos.Y - 4, 160, 24);
@@ -293,7 +294,7 @@ namespace OpenRA
 
 		public void DrawMapChooser()
 		{
-			var w = 800;
+			/*var w = 800;
 			var h = 600;
 			var r = new Rectangle( (Game.viewport.Width - w) / 2, (Game.viewport.Height - h) / 2, w, h );
 			DrawDialogBackground(r, "dialog");
@@ -381,6 +382,7 @@ namespace OpenRA
 			});
 
 			AddButton(r, _ => { });
+			*/
 		}
 		bool PaletteAvailable(int index) { return Game.LobbyInfo.Clients.All(c => c.PaletteIndex != index); }
 		bool SpawnPointAvailable(int index) { return (index == 0) || Game.LobbyInfo.Clients.All(c => c.SpawnPoint != index); }
@@ -437,13 +439,14 @@ namespace OpenRA
 		{
 			buttons.Clear();
 			DrawDownloadBar();
-
+			/*
 			if (showMapChooser)
 			{
 				DrawMapChooser();
 				return;
 			}
-
+			*/
+			
 			var w = 800;
 			var h = 600;
 			var r = new Rectangle( (Game.viewport.Width - w) / 2, (Game.viewport.Height - h) / 2, w, h );
@@ -456,7 +459,7 @@ namespace OpenRA
 			world.Minimap.Update();
 			world.Minimap.Draw(minimapRect, true);
 			world.Minimap.DrawSpawnPoints(minimapRect);
-
+			/*
 			if (Game.IsHost)
 			{
 				AddUiButton(new int2(r.Right - 100, r.Top + 300), "Change Map",
@@ -468,7 +471,8 @@ namespace OpenRA
 					mapPreviewDirty = true;
 				});
 			}
-
+			*/
+			
 			var f = renderer.BoldFont;
 			f.DrawText(rgbaRenderer, "Name", new int2(r.Left + 40, r.Top + 50), Color.White);
 			f.DrawText(rgbaRenderer, "Color", new int2(r.Left + 140, r.Top + 50), Color.White);

OpenRA.Game/GameRules/UserSettings.cs

@@ -41,7 +41,7 @@ namespace OpenRA.GameRules
 		// External game settings
 		public readonly string NetworkHost = "";
 		public readonly int NetworkPort = 0;
-		public readonly string Map = "testmap.yaml";
+		public readonly string Map = "testmap";
 		public readonly int Player = 1;
 		public readonly string Replay = "";
 		public readonly string PlayerName = "";

OpenRA.Game/World.cs

@@ -21,6 +21,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.IO;
 using OpenRA.Collections;
 using OpenRA.Effects;
 using OpenRA.FileFormats;
@@ -78,7 +79,27 @@ namespace OpenRA
 		{
 			Timer.Time( "----World.ctor" );
 			
-			Map = new Map( Game.LobbyInfo.GlobalSettings.Map );
+			// TODO: Do this properly
+			string mapPath = null;
+			foreach (var mod in Game.LobbyInfo.GlobalSettings.Mods)
+			{
+				var path = "mods/"+mod+"/maps/"+Game.LobbyInfo.GlobalSettings.Map+"/";
+				if (Directory.Exists(path))
+				{
+					mapPath = path;
+					break;
+				}
+			}
+			if (mapPath == null)
+			{
+				var path = "maps/"+Game.LobbyInfo.GlobalSettings.Map+"/";
+				if (!Directory.Exists(path))
+					throw new InvalidDataException("Unknown map `{0}`".F(Game.LobbyInfo.GlobalSettings.Map));
+				mapPath = path;
+			}
+			Map = new Map( new Folder(mapPath) );
+			
+			
 			customTerrain = new ICustomTerrain[Map.MapSize.X, Map.MapSize.Y];
 			Timer.Time( "new Map: {0}" );