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

Hacky fix for group movement

Browse Source
This commit is contained in:
Paul Chote
2011-02-03 19:27:05 +13:00
parent 7c2a7db794
commit 73a08624ef
4 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenRA.Mods.RA/Move/Mobile.cs
View File

@@ -41,7 +41,7 @@ namespace OpenRA.Mods.RA.Move
[FieldLoader.Load]
public readonly bool OnRails = false;
[FieldLoader.Load]
public readonly bool SharesCell = true;
public readonly bool SharesCell = false;
public virtual object Create(ActorInitializer init) { return new Mobile(init, this); }
@@ -124,7 +124,7 @@ namespace OpenRA.Mods.RA.Move
int __facing;
int2 __fromCell, __toCell;
SubCell __fromSubCell, __toSubCell;
public SubCell __fromSubCell, __toSubCell;
int __altitude;
@@ -296,13 +296,13 @@ namespace OpenRA.Mods.RA.Move
public IEnumerable<Pair<int2, SubCell>> OccupiedCells()
{
if (fromCell == toCell)
yield return Pair.New(fromCell, SubCell.FullCell);
yield return Pair.New(fromCell, __fromSubCell);
else if (CanEnterCell(toCell))
yield return Pair.New(toCell, SubCell.FullCell);
yield return Pair.New(toCell, __toSubCell);
else
{
yield return Pair.New(fromCell, SubCell.FullCell);
yield return Pair.New(toCell, SubCell.FullCell);
yield return Pair.New(fromCell, __fromSubCell);
yield return Pair.New(toCell, __toSubCell);
}
}