gptbot/0ad
1
0
Fork 0
forked from mirrors/0ad
Code Pull Requests Activity

Add parenthesis suggested by gcc 5.4 following 3e59ac76ee, refs #4278.

Browse Source 
This was SVN commit r18924.
This commit is contained in:
elexis
2016-11-12 16:07:23 +00:00
parent 1a05eba451
commit 2ec3f3ebaa
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/simulation2/components/CCmpUnitMotion.cpp
+2 -2
View File
@@ -1579,7 +1579,7 @@ bool CCmpUnitMotion::MoveToTargetRange(entity_id_t target, entity_pos_t minRange
entity_pos_t previousDistance = Geometry::DistanceToSquare(pos - CFixedVector2D(previousObstruction.x, previousObstruction.z), obstruction.u, obstruction.v, halfSize, true);
bool inside = distance.IsZero() && !Geometry::DistanceToSquare(pos - CFixedVector2D(obstruction.x, obstruction.z), obstruction.u, obstruction.v, halfSize).IsZero();
if (distance < minRange && previousDistance < minRange || inside)
if ((distance < minRange && previousDistance < minRange) || inside)
{
// Too close to the square - need to move away
@@ -1701,7 +1701,7 @@ bool CCmpUnitMotion::IsInTargetRange(entity_id_t target, entity_pos_t minRange,
// See if we're too close to the target square
bool inside = distance.IsZero() && !Geometry::DistanceToSquare(pos - CFixedVector2D(obstruction.x, obstruction.z), obstruction.u, obstruction.v, halfSize).IsZero();
if (distance < minRange && previousDistance < minRange || inside)
if ((distance < minRange && previousDistance < minRange) || inside)
return false;
// See if we're close enough to the target square