From 0e72385fa4cf674b8ffd6221efd16cb57daf0821 Mon Sep 17 00:00:00 2001
From: BlueRaja <BlueRaja.admin@gmail.com>
Date: Sat, 25 Aug 2012 06:08:13 -0500
Subject: Fixed score determination, blocking with multiple paths

---
 do.php | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

(limited to 'do.php')

diff --git a/do.php b/do.php
index ebdfda9..4e0b88d 100644
--- a/do.php
+++ b/do.php
@@ -128,22 +128,24 @@ if ($_GET['r'] == 'getpath') {
 	$map = GenerateMapByCode($mapcode);
 	$mygrid = MergeMapSolution($map, $solution);
 
-	// Old
-	//$json = routePath($mygrid);
-	
-	// New
-	// TODO: Broken!
-	//Route the path
-	$json['path'][] = routePath($mygrid);
-	$json['path'][] = routePath($mygrid, false, true);
+	//Check both starting point groups for paths
+	$moves = 0;
+	$json['blocked'] = false;
+	$containsNormalStart = (findTiles($mygrid, "s") !== false);
+	$containsReverseStart = (findTiles($mygrid, "S") !== false);
+	if($containsNormalStart)
+	{
+		$json['path'][0] = routePath($mygrid);
+		$moves += $json['path'][0]['moves'];
+		$json['blocked'] = $json['path'][0]['blocked'];
+	}
+	if($containsReverseStart)
+	{
+		$json['path'][1] = routePath($mygrid, false, true);
+		$moves += $json['path'][1]['moves'];
+		$json['blocked'] = $json['path'][1]['blocked'] || $json['blocked'];
+	}
 	
-	// TODO: Tmp
-	//$moves = $json['moves'];
-	$moves = $json['path1']['moves'];
-
-	// TODO: Tmp 
-	$json['blocked'] = ($json['path1']['blocked']);
-
 	$json['mapid'] = $mapID;
 
 	//What could go wrong?
-- 
cgit v1.2.3