From 0803c821ae4d78f827f593cb6030988e8f91aa27 Mon Sep 17 00:00:00 2001
From: Nikolay Korolev <nickvnuk@gmail.com>
Date: Mon, 1 Jun 2020 12:45:03 +0300
Subject: fixed roadblocks

---
 src/control/PathFind.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'src/control/PathFind.cpp')

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;
-- 
cgit v1.2.3