epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove a use of Game.viewport in actor code

Browse Source
This commit is contained in:
Chris Forbes
2010-01-29 19:52:03 +13:00
parent d043f6690d
commit 045439b666
6 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenRa.Game/Actor.cs
View File

@@ -92,8 +92,7 @@ namespace OpenRa
if (!World.Map.IsInMap(xy.X, xy.Y)) if (!World.Map.IsInMap(xy.X, xy.Y))
return null; return null;
var loc = mi.Location + Game.viewport.Location; var underCursor = World.FindUnitsAtMouse(mi.Location).FirstOrDefault();
var underCursor = World.FindUnits(loc, loc).FirstOrDefault();
if (underCursor != null && !underCursor.traits.Contains<Selectable>()) if (underCursor != null && !underCursor.traits.Contains<Selectable>())
underCursor = null; underCursor = null;

3
OpenRa.Game/Orders/PowerDownOrderGenerator.cs
View File

@@ -21,8 +21,7 @@ namespace OpenRa.Orders
{ {
if (mi.Button == MouseButton.Left) if (mi.Button == MouseButton.Left)
{ {
var loc = mi.Location + Game.viewport.Location; var underCursor = world.FindUnitsAtMouse(mi.Location)
var underCursor = world.FindUnits(loc, loc)
.Where(a => a.Owner == world.LocalPlayer .Where(a => a.Owner == world.LocalPlayer
&& a.traits.Contains<CanPowerDown>()) && a.traits.Contains<CanPowerDown>())
.FirstOrDefault(); .FirstOrDefault();

3
OpenRa.Game/Orders/RepairOrderGenerator.cs
View File

@@ -21,8 +21,7 @@ namespace OpenRa.Orders
{ {
if (mi.Button == MouseButton.Left) if (mi.Button == MouseButton.Left)
{ {
var loc = mi.Location + Game.viewport.Location; var underCursor = world.FindUnitsAtMouse(mi.Location)
var underCursor = world.FindUnits(loc, loc)
.Where(a => a.Owner == world.LocalPlayer .Where(a => a.Owner == world.LocalPlayer
&& a.traits.Contains<Building>() && a.traits.Contains<Building>()
&& a.traits.Contains<Selectable>()).FirstOrDefault(); && a.traits.Contains<Selectable>()).FirstOrDefault();

3
OpenRa.Game/Orders/SellOrderGenerator.cs
View File

@@ -21,8 +21,7 @@ namespace OpenRa.Orders
{ {
if (mi.Button == MouseButton.Left) if (mi.Button == MouseButton.Left)
{ {
var loc = mi.Location + Game.viewport.Location; var underCursor = world.FindUnitsAtMouse(mi.Location)
var underCursor = world.FindUnits(loc, loc)
.Where(a => a.Owner == world.LocalPlayer .Where(a => a.Owner == world.LocalPlayer
&& a.traits.Contains<Building>() && a.traits.Contains<Building>()
&& a.traits.Contains<Selectable>()).FirstOrDefault(); && a.traits.Contains<Selectable>()).FirstOrDefault();

3
OpenRa.Game/Traits/ChronoshiftPower.cs
View File

@@ -87,8 +87,7 @@ namespace OpenRa.Traits
{ {
if (mi.Button == MouseButton.Left) if (mi.Button == MouseButton.Left)
{ {
var loc = mi.Location + Game.viewport.Location; var underCursor = world.FindUnitsAtMouse(mi.Location)
var underCursor = world.FindUnits(loc, loc)
.Where(a => a.Owner != null && a.traits.Contains<Chronoshiftable>() .Where(a => a.Owner != null && a.traits.Contains<Chronoshiftable>()
&& a.traits.Contains<Selectable>()).FirstOrDefault(); && a.traits.Contains<Selectable>()).FirstOrDefault();

4
OpenRa.Game/Traits/CrateSpawnPower.cs
View File

@@ -51,9 +51,7 @@ namespace OpenRa.Traits
{ {
if (mi.Button == MouseButton.Left) if (mi.Button == MouseButton.Left)
{ {
var loc = mi.Location + Game.viewport.Location; var underCursor = world.FindUnitsAtMouse(mi.Location).FirstOrDefault();
var underCursor = world.FindUnits(loc, loc).FirstOrDefault();
if (underCursor == null) if (underCursor == null)
yield return new Order("SpawnCrate", world.LocalPlayer.PlayerActor, xy); yield return new Order("SpawnCrate", world.LocalPlayer.PlayerActor, xy);
} }