1 files changed, 22 insertions, 29 deletions

diff --git a/src/control/PathFind.cpp b/src/control/PathFind.cpp
index 700a89f1..3c16202b 100644
--- a/src/control/PathFind.cpp
+++ b/src/control/PathFind.cpp
@@ -1278,51 +1278,39 @@ CPathFind::DoPathSearch(uint8 type, CVector start, int32 startNodeId, CVector ta
 		targetNode = FindNodeClosestToCoors(target, type, distLimit);
 	else
 		targetNode = forcedTargetNode;
-	if(targetNode < 0) {
-		*pNumNodes = 0;
-		if(pDist) *pDist = 100000.0f;
-		return;
-	}
+	if(targetNode < 0)
+		goto fail;
 
 	// Find start
 	int numPathsToTry;
 	CTreadable *startObj;
-	if(startNodeId < 0) {
+	if(startNodeId < 0){
 		if(vehicle == nil || (startObj = vehicle->m_treadable[type]) == nil)
 			startObj = FindRoadObjectClosestToCoors(start, type);
 		numPathsToTry = 0;
-		for(i = 0; i < 12; i++) {
-			if(startObj->m_nodeIndices[type][i] < 0) break;
-			if(m_pathNodes[startObj->m_nodeIndices[type][i]].group ==
-			   m_pathNodes[targetNode].group)
+		for(i = 0; i < 12; i++){
+			if(startObj->m_nodeIndices[type][i] < 0)
+				break;
+			if(m_pathNodes[startObj->m_nodeIndices[type][i]].group == m_pathNodes[targetNode].group)
 				numPathsToTry++;
 		}
-	} else {
+	}else{
 		numPathsToTry = 1;
 		startObj = m_mapObjects[m_pathNodes[startNodeId].objectIndex];
 	}
-	if(numPathsToTry == 0) {
-		*pNumNodes = 0;
-		if(pDist) *pDist = 100000.0f;
-		return;
-	}
+	if(numPathsToTry == 0)
+		goto fail;
 
-	if(startNodeId < 0) {
+	if(startNodeId < 0){
 		// why only check node 0?
-		if(m_pathNodes[startObj->m_nodeIndices[type][0]].group !=
-		   m_pathNodes[targetNode].group) {
-			*pNumNodes = 0;
-			if(pDist) *pDist = 100000.0f;
-			return;
-		}
-	} else {
-		if(m_pathNodes[startNodeId].group != m_pathNodes[targetNode].group) {
-			*pNumNodes = 0;
-			if(pDist) *pDist = 100000.0f;
-			return;
-		}
+		if(m_pathNodes[startObj->m_nodeIndices[type][0]].group != m_pathNodes[targetNode].group)
+			goto fail;
+	}else{
+		if(m_pathNodes[startNodeId].group != m_pathNodes[targetNode].group)
+			goto fail;
 	}
 
+
 	for(i = 0; i < 512; i++)
 		m_searchNodes[i].next = nil;
 	AddNodeToList(&m_pathNodes[targetNode], 0);
@@ -1400,6 +1388,11 @@ CPathFind::DoPathSearch(uint8 type, CVector start, int32 startNodeId, CVector ta
 	for(i = 0; i < numNodesToBeCleared; i++)
 		apNodesToBeCleared[i]->distance = MAX_DIST;
 	return;
+
+fail:
+	*pNumNodes = 0;
+	if(pDist)
+		*pDist = 100000.0f;
 }
 
 static CPathNode *pNodeList[32];