From 0759852ab7a9af16e5f4c444ef5d1e0db6feabd3 Mon Sep 17 00:00:00 2001
From: Patrick Davison <snapwilliam@gmail.com>
Date: Sat, 18 Aug 2012 17:45:59 -0700
Subject: The start on Multi-day maps and Dual Path mechanic  Halfway started
 both.

---
 do.php | 37 +++++++++++++++++++++++++++++++------
 1 file changed, 31 insertions(+), 6 deletions(-)

(limited to 'do.php')

diff --git a/do.php b/do.php
index 549cfaf..5473cba 100644
--- a/do.php
+++ b/do.php
@@ -128,10 +128,21 @@ if ($_GET['r'] == 'getpath') {
 	$map = GenerateMapByCode($mapcode);
 	$mygrid = MergeMapSolution($map, $solution);
 
+	// Old
+	//$json = routePath($mygrid);
+	
+	// New
+	// !! Broken!
 	//Route the path
-	$json = routePath($mygrid, $start);
+	$json['path1'] = routePath($mygrid);
+	$json['path2'] = routePath($mygrid, 'X');
+	
+	// !! Tmp
+	//$moves = $json['moves'];
+	$moves = $json['path1']['moves'];
 
-	$moves = $json['moves'];
+	// !! Tmp 
+	$json['blocked'] = ($json['path1']['blocked']);
 
 	$json['mapid'] = $mapID;
 
@@ -218,7 +229,7 @@ if ($_GET['r'] == 'getpath') {
 	$checkcm = false;
 
 	//Is there an existing record?
-	if ($myMoves > 0) {
+	if (isset($myMoves)) {
 		if ($myMoves < $moves) {
 			$sql = "UPDATE `solutions`
 			SET `moves` = '$moves'  	,
@@ -265,10 +276,24 @@ if ($_GET['r'] == 'getpath') {
 
 
 function isCurrentMap($mapID) {
+	// !! Broke
 	include_once('./includes/db.inc.php');
-	$sql = "SELECT `ID` FROM `mapOfTheDay`
-	WHERE `mapDate` = CURDATE() AND
-		`mapID` = '$mapID'
+	$sql = "SELECT maps.ID
+	FROM `mapOfTheDay`
+	LEFT JOIN `maps` ON maps.ID = `mapID`
+	WHERE 
+		`mapID` = '$mapID' AND
+		(
+			( 
+				DATEDIFF(CURDATE(), mapOfTheDay.mapDate) < 1 AND
+				`mapType` IN (1, 2, 3, 4)
+			)
+		OR
+			(
+				DATEDIFF(CURDATE(), mapOfTheDay.mapDate) < 2 AND
+				`mapType` IN (5)
+			)
+		)
 	";
 	$result = mysql_query($sql) or die(mysql_error());
 	if (mysql_num_rows($result) == 0)
-- 
cgit v1.2.3