#153 mouse cursor issues in vicinity of trees

Mailaender · May 5, 2010 · c6ab4be · c6ab4be
1 parent 1c50ec1
commit c6ab4be
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/OpenRA.Game/Actor.cs b/OpenRA.Game/Actor.cs
@@ -123,12 +123,10 @@ public Order Order( int2 xy, MouseInput mi )
 
 			if (!World.Map.IsInMap(xy.X, xy.Y))
 				return null;
-
-			var underCursor = World.FindUnitsAtMouse(mi.Location).FirstOrDefault();
-
-			if (underCursor != null && !underCursor.traits.Contains<Selectable>())
-				underCursor = null;
 
+			var underCursor = World.FindUnitsAtMouse(mi.Location)
+				.FirstOrDefault(a => a.traits.Contains<Selectable>());
+
 			return traits.WithInterface<IIssueOrder>()
 				.Select( x => x.IssueOrder( this, xy, mi, underCursor ) )
 				.FirstOrDefault( x => x != null );