NO THAT IS NOT WHAT YOU DO WITH USELESS CODE

OpenRA.FileFormats/Map/Map.cs

@@ -157,8 +157,9 @@ namespace OpenRA.FileFormats
 		{
 			using (var dataStream = Package.GetContent("map.bin"))
 			{
-				//byte version = 
+				if (ReadByte(dataStream) != 1)
-				ReadByte(dataStream);
+					throw new InvalidDataException("Unknown binary map format");
+
 				// Load header info
 				var width = ReadWord(dataStream);
 				var height = ReadWord(dataStream);

OpenRA.Game/PathSearch.cs

@@ -30,7 +30,6 @@ namespace OpenRA
 	public class PathSearch
 	{
 		World world;
-		//ResourceLayer resources;
 		public CellInfo[ , ] cellInfo;
 		public PriorityQueue<PathDistance> queue;
 		public Func<int2, float> heuristic;
@@ -51,7 +50,6 @@ namespace OpenRA
 
 			buildingInfluence = world.WorldActor.traits.Get<BuildingInfluence>();
 			unitInfluence = world.WorldActor.traits.Get<UnitInfluence>();
-			//resources = world.WorldActor.traits.Get<ResourceLayer>();
 		}
 
 		public PathSearch InReverse()

OpenRA.Game/Traits/Modifiers/WithMuzzleFlash.cs

@@ -40,7 +40,6 @@ namespace OpenRA.Traits
 
 			muzzleFlash = new Animation(render.GetImage(self), () => unit.Facing);
 			muzzleFlash.Play("muzzle");
-			//var len = muzzleFlash.CurrentSequence.Length;
 
 			render.anims.Add("muzzle", new RenderSimple.AnimationWithOffset(
 				muzzleFlash,

OpenRA.Game/Traits/Player/ConquestVictoryConditions.cs

@@ -36,7 +36,6 @@ namespace OpenRA.Traits
 
 		public void Tick(Actor self)
 		{
-			//var info = self.Info.Traits.Get<ConquestVictoryConditionsInfo>();
 			var hasAnything = self.World.Queries.OwnedBy[self.Owner]
 				.WithTrait<MustBeDestroyed>().Any();
 

OpenRA.Game/Traits/Render/RenderBuildingWall.cs

@@ -32,17 +32,12 @@ namespace OpenRA.Traits
 	class RenderBuildingWall : RenderBuilding
 	{
 		string seqName;
-		int damageStates;
-		//Actor self;
 		int adjacentWalls = 0;
 		
 		public RenderBuildingWall(Actor self)
 			: base(self)
 		{
 			seqName = "idle";
-			//this.self = self;
-			this.damageStates = self.Info.Traits.Get<RenderBuildingWallInfo>().DamageStates;
-
 			anim.PlayFetchIndex(seqName, () => adjacentWalls);
 		}
 
@@ -72,6 +67,8 @@ namespace OpenRA.Traits
 			var oldState = GetExtendedState(self, e.Damage);
 			var newState = GetExtendedState(self, 0);
 
+			var numStates = self.Info.Traits.Get<RenderBuildingWallInfo>().DamageStates;
+
 			if (oldState == newState) return;
 
 			switch (newState)
@@ -80,7 +77,7 @@ namespace OpenRA.Traits
 					seqName = "idle";
 					break;
 				case ExtendedDamageState.ThreeQuarter:
-					if (damageStates >= 4)
+					if (numStates >= 4)
 						seqName = "minor-damaged-idle";
 					break;
 				case ExtendedDamageState.Half:
@@ -88,7 +85,7 @@ namespace OpenRA.Traits
 					Sound.Play(self.Info.Traits.Get<BuildingInfo>().DamagedSound, self.CenterLocation);
 					break;
 				case ExtendedDamageState.Quarter:
-					if (damageStates >= 3)
+					if (numStates >= 3)
 					{
 						seqName = "critical-idle";
 						Sound.Play(self.Info.Traits.Get<BuildingInfo>().DamagedSound, self.CenterLocation);

OpenRA.Game/Traits/Repairable.cs

@@ -1,4 +1,4 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
  * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
  * This file is part of OpenRA.
@@ -44,7 +44,6 @@ namespace OpenRA.Traits
 
 			if (order.OrderString == "Enter")
 			{
-				//var res = order.TargetActor.traits.GetOrDefault<Reservable>();
                 var rp = order.TargetActor.traits.GetOrDefault<RallyPoint>();
 
 				self.CancelActivity();

OpenRA.Game/Widgets/BuildPaletteWidget.cs

@@ -222,7 +222,6 @@ namespace OpenRA.Widgets
 
 			// Icons
 			string tooltipItem = null;
-			//float2 tooltipPos = float2.Zero;
 			foreach (var item in allBuildables)
 			{
 				var rect = new RectangleF(origin.X + x * 64, origin.Y + 48 * y, 64, 48);
@@ -233,10 +232,7 @@ namespace OpenRA.Widgets
 				var firstOfThis = queue.AllItems(queueName).FirstOrDefault(a => a.Item == item.Name);
 
 				if (rect.Contains(Game.chrome.lastMousePos.ToPoint()))
-				{
 					tooltipItem = item.Name;
-					//tooltipPos = drawPos;
-				}
 
 				var overlayPos = drawPos + new float2((64 - ready.Image.size.X) / 2, 2);
 
@@ -470,7 +466,6 @@ namespace OpenRA.Widgets
 		void DrawProductionTooltip(World world, string unit, int2 pos)
 		{
 			pos.Y += 15;
-			//var chromeCollection = "chrome-" + world.LocalPlayer.Country.Race;
 
 			var p = pos.ToFloat2() - new float2(297, -3);
 
@@ -534,8 +529,6 @@ namespace OpenRA.Widgets
             int size = p.visibleTabs.Count();
             if (size > 0)
             {
-                //string last = p.visibleTabs.Last();
-                //string first = p.visibleTabs.First();
                 int current = p.visibleTabs.IndexOf(p.currentTab);
                 if (!shift)
                 {

OpenRA.Game/World.cs

@@ -138,18 +138,9 @@ namespace OpenRA
 		
 		public void Tick()
 		{
-			//var sw = new Stopwatch();
-
 			foreach (var a in actors) a.Tick();
 
-			Queries.WithTraitMultiple<ITick>().Do( x =>
+			Queries.WithTraitMultiple<ITick>().Do(x => x.Trait.Tick(x.Actor));
-			{
-				//var t = sw.ElapsedTime();
-				x.Trait.Tick( x.Actor );
-				//var dt = sw.ElapsedTime() - t;
-//				if( dt > 0.001 )
-//					Log.Write( "expensive tick: {0}->{1}", x.Actor.Info.Name, x.Trait.GetType() );
-			} );
 
 			foreach (var e in effects) e.Tick( this );
 
@@ -172,8 +163,6 @@ namespace OpenRA
 		}
 
 		public int SyncHash()
-		{
-			//using (new PerfSample("synchash"))
 		{
 			int ret = 0;
 			foreach (var a in Actors)
@@ -181,7 +170,6 @@ namespace OpenRA
 
 			return ret;
 		}
-		}
 
 		public class AllQueries
 		{