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

remove setters on Mobile.{from,to}Cell. use SetLocation instead

Browse Source
This commit is contained in:
Bob
2010-09-26 16:46:22 +12:00
parent c790db8e84
commit 911db3feb1
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenRA.Game/Traits/Activities/Move.cs
View File

@@ -156,7 +156,7 @@ namespace OpenRA.Traits.Activities
}
else
{
mobile.toCell = nextCell.Value;
mobile.SetLocation( mobile.fromCell, nextCell.Value );
var move = new MoveFirstHalf(
this,
Util.CenterOfCell( mobile.fromCell ),
@@ -350,8 +350,7 @@ namespace OpenRA.Traits.Activities
mobile.Facing,
Util.GetNearestFacing( mobile.Facing, Util.GetFacing( nextCell.Value - mobile.toCell, mobile.Facing ) ),
moveFraction - moveFractionTotal );
mobile.fromCell = mobile.toCell;
mobile.toCell = nextCell.Value;
mobile.SetLocation( mobile.toCell, nextCell.Value );
return ret;
}
else
@@ -364,7 +363,7 @@ namespace OpenRA.Traits.Activities
mobile.Facing,
mobile.Facing,
moveFraction - moveFractionTotal );
mobile.fromCell = mobile.toCell;
mobile.SetLocation( mobile.toCell, mobile.toCell );
return ret2;
}
}
@@ -379,7 +378,7 @@ namespace OpenRA.Traits.Activities
protected override MovePart OnComplete( Actor self, Mobile mobile, Move parent )
{
self.CenterLocation = Util.CenterOfCell( mobile.toCell );
mobile.fromCell = mobile.toCell;
mobile.SetLocation( mobile.toCell, mobile.toCell );
mobile.FinishedMoving(self);
return null;
}