summaryrefslogtreecommitdiffstats
path: root/src/control/PathFind.cpp
diff options
context:
space:
mode:
authorFilip Gawin <filip.gawin@zoho.com>2019-07-31 17:54:18 +0200
committerFilip Gawin <filip.gawin@zoho.com>2019-08-27 21:13:17 +0200
commitaf5bd951aeb43c341d5126bc4141992169e46d57 (patch)
tree08c819a7c31d30abb6915b21b80239ace256b692 /src/control/PathFind.cpp
parentMerge pull request #197 from Nick007J/master (diff)
downloadre3-af5bd951aeb43c341d5126bc4141992169e46d57.tar
re3-af5bd951aeb43c341d5126bc4141992169e46d57.tar.gz
re3-af5bd951aeb43c341d5126bc4141992169e46d57.tar.bz2
re3-af5bd951aeb43c341d5126bc4141992169e46d57.tar.lz
re3-af5bd951aeb43c341d5126bc4141992169e46d57.tar.xz
re3-af5bd951aeb43c341d5126bc4141992169e46d57.tar.zst
re3-af5bd951aeb43c341d5126bc4141992169e46d57.zip
Diffstat (limited to 'src/control/PathFind.cpp')
-rw-r--r--src/control/PathFind.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/control/PathFind.cpp b/src/control/PathFind.cpp
index e9b33395..87ce4476 100644
--- a/src/control/PathFind.cpp
+++ b/src/control/PathFind.cpp
@@ -207,8 +207,8 @@ CPathFind::PreparePathData(void)
numExtern++;
if(InfoForTileCars[k].numLeftLanes + InfoForTileCars[k].numRightLanes > numLanes)
numLanes = InfoForTileCars[k].numLeftLanes + InfoForTileCars[k].numRightLanes;
- maxX = max(maxX, Abs(InfoForTileCars[k].x));
- maxY = max(maxY, Abs(InfoForTileCars[k].y));
+ maxX = Max(maxX, Abs(InfoForTileCars[k].x));
+ maxY = Max(maxY, Abs(InfoForTileCars[k].y));
}else if(InfoForTileCars[k].type == NodeTypeIntern)
numIntern++;
}
@@ -392,7 +392,7 @@ CPathFind::PreparePathDataForType(uint8 type, CTempNode *tempnodes, CPathInfoFor
if(Abs(dx) < nearestDist){
dy = tempnodes[k].pos.y - CoorsXFormed.y;
if(Abs(dy) < nearestDist){
- nearestDist = max(Abs(dx), Abs(dy));
+ nearestDist = Max(Abs(dx), Abs(dy));
nearestId = k;
}
}
@@ -501,13 +501,13 @@ CPathFind::PreparePathDataForType(uint8 type, CTempNode *tempnodes, CPathInfoFor
// Find i inside path segment
iseg = 0;
- for(j = max(oldNumPathNodes, i-12); j < i; j++)
+ for(j = Max(oldNumPathNodes, i-12); j < i; j++)
if(m_pathNodes[j].objectIndex == m_pathNodes[i].objectIndex)
iseg++;
istart = 12*m_mapObjects[m_pathNodes[i].objectIndex]->m_modelIndex;
// Add links to other internal nodes
- for(j = max(oldNumPathNodes, i-12); j < min(m_numPathNodes, i+12); j++){
+ for(j = Max(oldNumPathNodes, i-12); j < Min(m_numPathNodes, i+12); j++){
if(m_pathNodes[i].objectIndex != m_pathNodes[j].objectIndex || i == j)
continue;
// N.B.: in every path segment, the externals have to be at the end