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

Merge pull request #3715 from Mailaender/move-fraction-zero-division

Browse Source 
Fixed division through zero in moveFractionTotal
This commit is contained in:
Paul Chote
2013-08-21 14:05:29 -07:00
parent bdb0b249b0 d167eaea04
commit f39371d249
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRA.Mods.RA/Move/Move.cs
View File

@@ -45,7 +45,7 @@ namespace OpenRA.Mods.RA.Move
this.nearEnough = WRange.Zero;
}
// Hack for legacy code
// HACK: for legacy code
public Move(CPos destination, int nearEnough)
: this(destination, WRange.FromCells(nearEnough)) { }
@@ -319,7 +319,11 @@ namespace OpenRA.Mods.RA.Move
void UpdateCenterLocation(Actor self, Mobile mobile)
{
mobile.SetVisualPosition(self, WPos.Lerp(from, to, moveFraction, moveFractionTotal));
// avoid division through zero
if (moveFractionTotal != 0)
mobile.SetVisualPosition(self, WPos.Lerp(from, to, moveFraction, moveFractionTotal));
else
mobile.SetVisualPosition(self, to);
if (moveFraction >= moveFractionTotal)
mobile.Facing = toFacing & 0xFF;
@@ -407,7 +411,7 @@ namespace OpenRA.Mods.RA.Move
if (a == null)
return false;
// Dirty, but it suffices until we do something better:
// HACK: Dirty, but it suffices until we do something better:
if (a.GetType() == typeof(Move)) return true;
if (a.GetType() == typeof(MoveAdjacentTo)) return true;
if (a.GetType() == typeof(AttackMove)) return true;