Start/end can no longer be placed on walls

tobinatore · Sep 8, 2020 · fc90684 · fc90684
1 parent 7d35e4e
commit fc90684
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/pathfinding.html b/pathfinding.html
@@ -720,15 +720,21 @@ <h4>Useful Links</h4>
         if (d == "start") {
           var newX = Math.round((gridX - 1) / 25);
           var newY = Math.round((gridY - 1) / 25);
-          if (newX != endPos.x || newY != endPos.y) {
+          if (
+            (newX != endPos.x || newY != endPos.y) &&
+            gridData[newY][newX].type != "wall"
+          ) {
             startPos.x = newX;
             startPos.y = newY;
             d3.select(this).attr("x", gridX).attr("y", gridY);
           }
         } else {
           var newX = Math.round((gridX - 1) / 25);
           var newY = Math.round((gridY - 1) / 25);
-          if (newX != startPos.x || newY != startPos.y) {
+          if (
+            (newX != startPos.x || newY != startPos.y) &&
+            gridData[newY][newX].type != "wall"
+          ) {
             endPos.x = Math.round((gridX - 1) / 25);
             endPos.y = Math.round((gridY - 1) / 25);
             d3.select(this).attr("x", gridX).attr("y", gridY);
@@ -738,8 +744,6 @@ <h4>Useful Links</h4>
 
       var gridData = gridData();
 
-      console.log(gridData);
-      console.log(grid);
       var drag = d3
         .drag()
         .subject(function () {
@@ -914,6 +918,7 @@ <h4>Useful Links</h4>
           }, delay)
         );
       }
+
       async function colorBlock(block, color, delayDraw, delay, mode) {
         return new Promise((resolve) => {
           if (mode == "fill") {