git-svn-id: svn://svn.ijw.co.nz/svn/OpenRa@1281 993157c7-ee19-0410-b2c4-bb4e9862e678

OpenRa.Game/Mcv.cs

@@ -85,19 +85,13 @@ namespace OpenRa.Game
 			float2 d = ( currentOrder.Destination - location ).Constrain( r );
 
 			int desiredFacing = GetFacing( d );
-			if (desiredFacing == facing)
+			int df = (desiredFacing - facing + 32) % 32;
+			if( df == 0 )
 				location += d;
-			else
-			{
-				int df = desiredFacing - facing;
-				if (df < 0)
-					df = 32 - df;
-
-				if (df < 32 - df)
-					facing = (facing + 1) % 32;
-				else
+			else if( df > 16 )
 				facing = ( facing + 31 ) % 32;
-			}
+			else
+				facing = ( facing + 1 ) % 32;
 		}
 	}
 }

OpenRa.Game/World.cs

@@ -37,12 +37,9 @@ namespace OpenRa.Game
 
 			foreach (Actor a in actors)
 			{
-				Sprite[] images = a.CurrentImages;
-
 				a.Tick( dt );
 
-				if (images == null)
-					continue;
+				Sprite[] images = a.CurrentImages;
 
 				if( a.location.X > range.End.X || a.location.X < range.Start.X - images[ 0 ].bounds.Width )
 					continue;