Remove "Show Shellmap" setting.

OpenRA.Game/Game.cs

@@ -533,38 +533,32 @@ namespace OpenRA
 					if (world == null)
 						return;
 
-					// Don't tick when the shellmap is disabled
-					if (world.ShouldTick)
+					var isNetTick = LocalTick % NetTickScale == 0;
+
+					if (!isNetTick || orderManager.IsReadyForNextFrame)
 					{
-						var isNetTick = LocalTick % NetTickScale == 0;
+						++orderManager.LocalFrameNumber;
 
-						if (!isNetTick || orderManager.IsReadyForNextFrame)
+						Log.Write("debug", "--Tick: {0} ({1})", LocalTick, isNetTick ? "net" : "local");
+
+						if (BenchmarkMode)
+							Log.Write("cpu", "{0};{1}".F(LocalTick, PerfHistory.Items["tick_time"].LastValue));
+
+						if (isNetTick)
+							orderManager.Tick();
+
+						Sync.CheckSyncUnchanged(world, () =>
 						{
-							++orderManager.LocalFrameNumber;
+							world.OrderGenerator.Tick(world);
+							world.Selection.Tick(world);
+						});
 
-							Log.Write("debug", "--Tick: {0} ({1})", LocalTick, isNetTick ? "net" : "local");
+						world.Tick();
 
-							if (BenchmarkMode)
-								Log.Write("cpu", "{0};{1}".F(LocalTick, PerfHistory.Items["tick_time"].LastValue));
-
-							if (isNetTick)
-								orderManager.Tick();
-
-							Sync.CheckSyncUnchanged(world, () =>
-							{
-								world.OrderGenerator.Tick(world);
-								world.Selection.Tick(world);
-							});
-
-							world.Tick();
-
-							PerfHistory.Tick();
-						}
-						else if (orderManager.NetFrameNumber == 0)
-							orderManager.LastTickTime = RunTime;
-					}
-					else
 						PerfHistory.Tick();
+					}
+					else if (orderManager.NetFrameNumber == 0)
+						orderManager.LastTickTime = RunTime;
 
 					// Wait until we have done our first world Tick before TickRendering
 					if (orderManager.LocalFrameNumber > 0)

OpenRA.Game/Graphics/WorldRenderer.cs

@@ -132,9 +132,6 @@ namespace OpenRA.Graphics
 
 			RefreshPalette();
 
-			if (World.Type == WorldType.Shellmap && !Game.Settings.Game.ShowShellmap)
-				return;
-
 			var renderables = GenerateRenderables();
 			var bounds = Viewport.GetScissorBounds(World.Type != WorldType.Editor);
 			Game.Renderer.EnableScissor(bounds);

OpenRA.Game/Settings.cs

@@ -158,8 +158,6 @@ namespace OpenRA
 
 		public string Platform = "Default";
 
-		public bool ShowShellmap = true;
-
 		public bool ViewportEdgeScroll = true;
 		public bool LockMouseWindow = false;
 		public MouseScrollType MiddleMouseScroll = MouseScrollType.Standard;

OpenRA.Game/World.cs

@@ -307,7 +307,6 @@ namespace OpenRA
 		public event Action<Actor> ActorAdded = _ => { };
 		public event Action<Actor> ActorRemoved = _ => { };
 
-		public bool ShouldTick { get { return Type != WorldType.Shellmap || Game.Settings.Game.ShowShellmap; } }
 		public bool Paused { get; internal set; }
 		public bool PredictedPaused { get; internal set; }
 		public bool PauseStateLocked { get; set; }