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

Avoid an integer (long) overflow in FindAndDeliverResources.

Browse Source
This commit is contained in:
Paul Chote
2019-08-22 10:42:29 +01:00
committed by abcdefg30
parent be1f820674
commit 4db3da61e1
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/Activities/FindAndDeliverResources.cs
View File

@@ -206,13 +206,13 @@ namespace OpenRA.Mods.Common.Activities
var pos = self.World.Map.CenterOfCell(loc); var pos = self.World.Map.CenterOfCell(loc);
// Calculate harv-cell-refinery angle (cosine rule) // Calculate harv-cell-refinery angle (cosine rule)
var aSq = (harvPos - procPos.Value).LengthSquared; var a = harvPos - procPos.Value;
var bSq = (pos - procPos.Value).LengthSquared; var b = pos - procPos.Value;
var cSq = (pos - harvPos).LengthSquared; var c = pos - harvPos;
if (bSq > 0 && cSq > 0) if (b != WVec.Zero && c != WVec.Zero)
{ {
var cosA = (int)(1024 * (bSq + cSq - aSq) / (2 * Exts.ISqrt(bSq * cSq))); var cosA = (int)(1024 * (b.LengthSquared + c.LengthSquared - a.LengthSquared) / (2 * b.Length * c.Length));
// Cost modifier varies between 0 and ResourceRefineryDirectionPenalty // Cost modifier varies between 0 and ResourceRefineryDirectionPenalty
return Math.Abs(harvInfo.ResourceRefineryDirectionPenalty / 2) + harvInfo.ResourceRefineryDirectionPenalty * cosA / 2048; return Math.Abs(harvInfo.ResourceRefineryDirectionPenalty / 2) + harvInfo.ResourceRefineryDirectionPenalty * cosA / 2048;