summaryrefslogtreecommitdiffstats
path: root/src/control/PathFind.cpp
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2020-06-01 11:45:03 +0200
committerNikolay Korolev <nickvnuk@gmail.com>2020-06-01 11:45:03 +0200
commit0803c821ae4d78f827f593cb6030988e8f91aa27 (patch)
treece452cefa3c4f56a183a7b911a5691f24756e157 /src/control/PathFind.cpp
parentMerge pull request #607 from rollschuh2282/master (diff)
downloadre3-0803c821ae4d78f827f593cb6030988e8f91aa27.tar
re3-0803c821ae4d78f827f593cb6030988e8f91aa27.tar.gz
re3-0803c821ae4d78f827f593cb6030988e8f91aa27.tar.bz2
re3-0803c821ae4d78f827f593cb6030988e8f91aa27.tar.lz
re3-0803c821ae4d78f827f593cb6030988e8f91aa27.tar.xz
re3-0803c821ae4d78f827f593cb6030988e8f91aa27.tar.zst
re3-0803c821ae4d78f827f593cb6030988e8f91aa27.zip
Diffstat (limited to 'src/control/PathFind.cpp')
-rw-r--r--src/control/PathFind.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/control/PathFind.cpp b/src/control/PathFind.cpp
index ee15b82f..46895678 100644
--- a/src/control/PathFind.cpp
+++ b/src/control/PathFind.cpp
@@ -404,11 +404,10 @@ CPathFind::PreparePathData(void)
maxX = 0.0f;
maxY = 0.0f;
for(j = 0; j < 12; j++){
- k = i*12 + j;
+ k = m_mapObjects[i]->GetModelIndex()*12 + j;
if(InfoForTileCars[k].type == NodeTypeExtern){
numExtern++;
- if(InfoForTileCars[k].numLeftLanes + InfoForTileCars[k].numRightLanes > numLanes)
- numLanes = InfoForTileCars[k].numLeftLanes + InfoForTileCars[k].numRightLanes;
+ numLanes = Max(numLanes, InfoForTileCars[k].numLeftLanes + InfoForTileCars[k].numRightLanes);
maxX = Max(maxX, Abs(InfoForTileCars[k].x));
maxY = Max(maxY, Abs(InfoForTileCars[k].y));
}else if(InfoForTileCars[k].type == NodeTypeIntern)
@@ -417,7 +416,7 @@ CPathFind::PreparePathData(void)
if(numIntern == 1 && numExtern == 2){
if(numLanes < 4){
- if((i & 7) == 4){ // WHAT?
+ if((i & 7) == 4){ // 1/8 probability
m_objectFlags[i] |= UseInRoadBlock;
if(maxX > maxY)
m_objectFlags[i] |= ObjectEastWest;