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

Fix some style issues in Mobile

Browse Source
This commit is contained in:
reaperrr
2016-06-04 21:44:48 +02:00
parent 099c44f6f9
commit f35338e88b
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRA.Mods.Common/Traits/Mobile.cs
View File

@@ -168,7 +168,7 @@ namespace OpenRA.Mods.Common.Traits
public int CalculateTilesetMovementClass(TileSet tileset) public int CalculateTilesetMovementClass(TileSet tileset)
{ {
/* collect our ability to cross *all* terraintypes, in a bitvector */ // collect our ability to cross *all* terraintypes, in a bitvector
return TilesetTerrainInfo[tileset].Select(ti => ti.Cost < int.MaxValue).ToBits(); return TilesetTerrainInfo[tileset].Select(ti => ti.Cost < int.MaxValue).ToBits();
} }
@@ -180,12 +180,12 @@ namespace OpenRA.Mods.Common.Traits
static bool IsMovingInMyDirection(Actor self, Actor other) static bool IsMovingInMyDirection(Actor self, Actor other)
{ {
var selfMobile = self.TraitOrDefault<Mobile>(); var selfMobile = self.TraitOrDefault<Mobile>();
if (selfMobile == null) return false; if (selfMobile == null)
return false;
var otherMobile = other.TraitOrDefault<Mobile>(); var otherMobile = other.TraitOrDefault<Mobile>();
if (otherMobile == null) return false; if (otherMobile == null || !otherMobile.IsMoving)
return false;
if (!otherMobile.IsMoving) return false;
// Sign of dot-product indicates (roughly) if vectors are facing in same or opposite directions: // Sign of dot-product indicates (roughly) if vectors are facing in same or opposite directions:
var dp = CVec.Dot(selfMobile.ToCell - self.Location, otherMobile.ToCell - other.Location); var dp = CVec.Dot(selfMobile.ToCell - self.Location, otherMobile.ToCell - other.Location);